Skip to content

Commit 6ffa290

Browse files
committed
No nightly clippy
1 parent 122d452 commit 6ffa290

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
os: [macos-latest, ubuntu-latest, windows-latest]
18-
rust: [stable, beta, nightly]
18+
rust: [stable, beta]
1919

2020
steps:
2121
- name: Prepare git

jvm/src/garbage_collector.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ fn find_static_reachable_objects(jvm: &Jvm, class: &Class, reachable_objects: &m
4545
let descriptor = field.descriptor();
4646
let value = class.definition.get_static_field(&*field).unwrap();
4747

48-
if ((descriptor.starts_with('L') && descriptor.ends_with(';')) || descriptor.starts_with('['))
49-
&& let JavaValue::Object(Some(value)) = value
50-
{
51-
find_reachable_objects(jvm, &value, reachable_objects);
48+
if (descriptor.starts_with('L') && descriptor.ends_with(';')) || descriptor.starts_with('[') {
49+
if let JavaValue::Object(Some(value)) = value {
50+
find_reachable_objects(jvm, &value, reachable_objects);
51+
}
5252
}
5353
}
5454
}

jvm/src/jvm.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -606,12 +606,13 @@ impl Jvm {
606606
}
607607

608608
async fn register_class_internal(&self, class: Class, class_loader_wrapper: Option<&dyn ClassLoaderWrapper>) -> Result<()> {
609-
if !class.definition.name().starts_with('[')
610-
&& let Some(super_class) = class.definition.super_class_name()
611-
&& !self.has_class(&super_class)
612-
{
613-
// ensure superclass is loaded
614-
self.resolve_class_internal(&super_class, class_loader_wrapper).await?;
609+
if !class.definition.name().starts_with('[') {
610+
if let Some(super_class) = class.definition.super_class_name() {
611+
if !self.has_class(&super_class) {
612+
// ensure superclass is loaded
613+
self.resolve_class_internal(&super_class, class_loader_wrapper).await?;
614+
}
615+
}
615616
}
616617

617618
self.inner.classes.write().insert(class.definition.name().to_owned(), class.clone());

0 commit comments

Comments
 (0)