Fix CI issues arising from use of Rust 1.64 (#6067)

targrub · targrub · commit a09dd034a269 · 2022-09-22T16:56:43.000Z
## Objective Fixes #6063 ## Solution - Use `then_some(x)` instead of `then( || x)`. - Updated error logs from `bevy_ecs_compile_fail_tests`. ## Migration Guide From Rust 1.63 to 1.64, a new Clippy error was added; now one should use `then_some(x)` instead of `then( || x)`.
diff --git a/crates/bevy_ecs/src/component.rs b/crates/bevy_ecs/src/component.rs
@@ -294,7 +294,7 @@ impl ComponentDescriptor {
             is_send_and_sync: true,
             type_id: Some(TypeId::of::<T>()),
             layout: Layout::new::<T>(),
-            drop: needs_drop::<T>().then(|| Self::drop_ptr::<T> as _),
+            drop: needs_drop::<T>().then_some(Self::drop_ptr::<T> as _),
         }
     }
 
@@ -331,7 +331,7 @@ impl ComponentDescriptor {
             is_send_and_sync: true,
             type_id: Some(TypeId::of::<T>()),
             layout: Layout::new::<T>(),
-            drop: needs_drop::<T>().then(|| Self::drop_ptr::<T> as _),
+            drop: needs_drop::<T>().then_some(Self::drop_ptr::<T> as _),
         }
     }
 
@@ -342,7 +342,7 @@ impl ComponentDescriptor {
             is_send_and_sync: false,
             type_id: Some(TypeId::of::<T>()),
             layout: Layout::new::<T>(),
-            drop: needs_drop::<T>().then(|| Self::drop_ptr::<T> as _),
+            drop: needs_drop::<T>().then_some(Self::drop_ptr::<T> as _),
         }
     }
 
diff --git a/crates/bevy_ecs/src/entity/mod.rs b/crates/bevy_ecs/src/entity/mod.rs
@@ -547,7 +547,7 @@ impl Entities {
             // If this entity was manually created, then free_cursor might be positive
             // Returning None handles that case correctly
             let num_pending = usize::try_from(-free_cursor).ok()?;
-            (idu < self.meta.len() + num_pending).then(|| Entity { generation: 0, id })
+            (idu < self.meta.len() + num_pending).then_some(Entity { generation: 0, id })
         }
     }
 
diff --git a/crates/bevy_ecs_compile_fail_tests/tests/ui/query_combin_exact_sized_iterator_safety.stderr b/crates/bevy_ecs_compile_fail_tests/tests/ui/query_combin_exact_sized_iterator_safety.stderr
@@ -17,7 +17,7 @@ error[E0277]: the trait bound `bevy_ecs::query::Changed<Foo>: ArchetypeFilter` i
              (F0, F1, F2, F3, F4, F5, F6, F7)
            and 26 others
    = note: required because of the requirements on the impl of `ArchetypeFilter` for `bevy_ecs::query::Or<(bevy_ecs::query::Changed<Foo>, bevy_ecs::query::With<Bar>)>`
-   = note: required because of the requirements on the impl of `ExactSizeIterator` for `QueryCombinationIter<'_, '_, &Foo, bevy_ecs::query::Or<(bevy_ecs::query::Changed<Foo>, bevy_ecs::query::With<Bar>)>, 2_usize>`
+   = note: required because of the requirements on the impl of `ExactSizeIterator` for `QueryCombinationIter<'_, '_, &Foo, bevy_ecs::query::Or<(bevy_ecs::query::Changed<Foo>, bevy_ecs::query::With<Bar>)>, 2>`
 note: required by a bound in `is_exact_size_iterator`
   --> tests/ui/query_combin_exact_sized_iterator_safety.rs:18:30
    |
@@ -43,7 +43,7 @@ error[E0277]: the trait bound `bevy_ecs::query::Added<Foo>: ArchetypeFilter` is
              (F0, F1, F2, F3, F4, F5, F6, F7)
            and 26 others
    = note: required because of the requirements on the impl of `ArchetypeFilter` for `(bevy_ecs::query::Added<Foo>, bevy_ecs::query::Without<Bar>)`
-   = note: required because of the requirements on the impl of `ExactSizeIterator` for `QueryCombinationIter<'_, '_, &Foo, (bevy_ecs::query::Added<Foo>, bevy_ecs::query::Without<Bar>), 2_usize>`
+   = note: required because of the requirements on the impl of `ExactSizeIterator` for `QueryCombinationIter<'_, '_, &Foo, (bevy_ecs::query::Added<Foo>, bevy_ecs::query::Without<Bar>), 2>`
 note: required by a bound in `is_exact_size_iterator`
   --> tests/ui/query_combin_exact_sized_iterator_safety.rs:18:30
    |
diff --git a/crates/bevy_ecs_compile_fail_tests/tests/ui/query_iter_combinations_mut_iterator_safety.stderr b/crates/bevy_ecs_compile_fail_tests/tests/ui/query_iter_combinations_mut_iterator_safety.stderr
@@ -17,7 +17,7 @@ error[E0277]: the trait bound `&mut A: ReadOnlyWorldQuery` is not satisfied
              (F0, F1, F2, F3, F4, F5, F6)
            and 49 others
    = note: `ReadOnlyWorldQuery` is implemented for `&A`, but not for `&mut A`
-   = note: required because of the requirements on the impl of `Iterator` for `QueryCombinationIter<'_, '_, &mut A, (), {_: usize}>`
+   = note: required because of the requirements on the impl of `Iterator` for `QueryCombinationIter<'_, '_, &mut A, (), _>`
 note: required by a bound in `is_iterator`
   --> tests/ui/query_iter_combinations_mut_iterator_safety.rs:13:19
    |
diff --git a/crates/bevy_ecs_compile_fail_tests/tests/ui/query_iter_many_mut_iterator_safety.stderr b/crates/bevy_ecs_compile_fail_tests/tests/ui/query_iter_many_mut_iterator_safety.stderr
@@ -17,7 +17,7 @@ error[E0277]: the trait bound `&mut A: ReadOnlyWorldQuery` is not satisfied
              (F0, F1, F2, F3, F4, F5, F6)
            and 49 others
    = note: `ReadOnlyWorldQuery` is implemented for `&A`, but not for `&mut A`
-   = note: required because of the requirements on the impl of `Iterator` for `QueryManyIter<'_, '_, &mut A, (), std::array::IntoIter<bevy_ecs::entity::Entity, 1_usize>>`
+   = note: required because of the requirements on the impl of `Iterator` for `QueryManyIter<'_, '_, &mut A, (), std::array::IntoIter<bevy_ecs::entity::Entity, 1>>`
 note: required by a bound in `is_iterator`
   --> tests/ui/query_iter_many_mut_iterator_safety.rs:13:19
    |
diff --git a/crates/bevy_window/src/system.rs b/crates/bevy_window/src/system.rs
@@ -44,7 +44,7 @@ pub fn close_on_esc(
 ) {
     // TODO: Track this in e.g. a resource to ensure consistent behaviour across similar systems
     for event in focused_events.iter() {
-        *focused = event.focused.then(|| event.id);
+        *focused = event.focused.then_some(event.id);
     }
 
     if let Some(focused) = &*focused {
diff --git a/tools/build-example-pages/src/main.rs b/tools/build-example-pages/src/main.rs
@@ -112,7 +112,7 @@ fn parse_examples(panic_on_missing: bool) -> Vec<Example> {
                 .get(&technical_name)
                 .and_then(|metadata| metadata.get("hidden"))
                 .and_then(|hidden| hidden.as_bool())
-                .and_then(|hidden| hidden.then(|| ()))
+                .and_then(|hidden| hidden.then_some(()))
                 .is_some()
             {
                 return None;

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ impl ComponentDescriptor {`
`294`	`294`	`is_send_and_sync: true,`
`295`	`295`	`type_id: Some(TypeId::of::<T>()),`
`296`	`296`	`layout: Layout::new::<T>(),`
`297`		`- drop: needs_drop::<T>().then(\|\| Self::drop_ptr::<T> as _),`
	`297`	`+ drop: needs_drop::<T>().then_some(Self::drop_ptr::<T> as _),`
`298`	`298`	`}`
`299`	`299`	`}`
`300`	`300`
`@@ -331,7 +331,7 @@ impl ComponentDescriptor {`
`331`	`331`	`is_send_and_sync: true,`
`332`	`332`	`type_id: Some(TypeId::of::<T>()),`
`333`	`333`	`layout: Layout::new::<T>(),`
`334`		`- drop: needs_drop::<T>().then(\|\| Self::drop_ptr::<T> as _),`
	`334`	`+ drop: needs_drop::<T>().then_some(Self::drop_ptr::<T> as _),`
`335`	`335`	`}`
`336`	`336`	`}`
`337`	`337`
`@@ -342,7 +342,7 @@ impl ComponentDescriptor {`
`342`	`342`	`is_send_and_sync: false,`
`343`	`343`	`type_id: Some(TypeId::of::<T>()),`
`344`	`344`	`layout: Layout::new::<T>(),`
`345`		`- drop: needs_drop::<T>().then(\|\| Self::drop_ptr::<T> as _),`
	`345`	`+ drop: needs_drop::<T>().then_some(Self::drop_ptr::<T> as _),`
`346`	`346`	`}`
`347`	`347`	`}`
`348`	`348`
Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ impl Entities {`
`547`	`547`	`// If this entity was manually created, then free_cursor might be positive`
`548`	`548`	`// Returning None handles that case correctly`
`549`	`549`	`let num_pending = usize::try_from(-free_cursor).ok()?;`
`550`		`- (idu < self.meta.len() + num_pending).then(\|\| Entity { generation: 0, id })`
	`550`	`+ (idu < self.meta.len() + num_pending).then_some(Entity { generation: 0, id })`
`551`	`551`	`}`
`552`	`552`	`}`
`553`	`553`
Original file line number	Diff line number	Diff line change
@@ -17,7 +17,7 @@ error[E0277]: the trait bound `&mut A: ReadOnlyWorldQuery` is not satisfied
`17`	`17`	`(F0, F1, F2, F3, F4, F5, F6)`
`18`	`18`	`and 49 others`
`19`	`19`	= note: `ReadOnlyWorldQuery` is implemented for `&A`, but not for `&mut A`
`20`		- = note: required because of the requirements on the impl of `Iterator` for `QueryCombinationIter<'_, '_, &mut A, (), {_: usize}>`
	`20`	+ = note: required because of the requirements on the impl of `Iterator` for `QueryCombinationIter<'_, '_, &mut A, (), _>`
`21`	`21`	note: required by a bound in `is_iterator`
`22`	`22`	`--> tests/ui/query_iter_combinations_mut_iterator_safety.rs:13:19`
`23`	`23`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ pub fn close_on_esc(`
`44`	`44`	`) {`
`45`	`45`	`// TODO: Track this in e.g. a resource to ensure consistent behaviour across similar systems`
`46`	`46`	`for event in focused_events.iter() {`
`47`		`- *focused = event.focused.then(\|\| event.id);`
	`47`	`+ *focused = event.focused.then_some(event.id);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`if let Some(focused) = &*focused {`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ fn parse_examples(panic_on_missing: bool) -> Vec<Example> {`
`112`	`112`	`.get(&technical_name)`
`113`	`113`	`.and_then(\|metadata\| metadata.get("hidden"))`
`114`	`114`	`.and_then(\|hidden\| hidden.as_bool())`
`115`		`- .and_then(\|hidden\| hidden.then(\|\| ()))`
	`115`	`+ .and_then(\|hidden\| hidden.then_some(()))`
`116`	`116`	`.is_some()`
`117`	`117`	`{`
`118`	`118`	`return None;`