Skip to content

Commit

Permalink
Fix CI for Rust 1.72 (bevyengine#9562)
Browse files Browse the repository at this point in the history
[Rust 1.72.0](https://blog.rust-lang.org/2023/08/24/Rust-1.72.0.html) is
now stable.

- `let-else` formatting has arrived!
- I chose to allow `explicit_iter_loop` due to
rust-lang/rust-clippy#11074.

We didn't hit any of the false positives that prevent compilation, but
fixing this did produce a lot of the "symbol soup" mentioned, e.g. `for
image in &mut *image_events {`.

  Happy to undo this if there's consensus the other way.

---------

Co-authored-by: François <mockersf@gmail.com>
  • Loading branch information
2 people authored and Trashtalk217 committed Aug 28, 2023
1 parent 1963e63 commit 069db4b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
3 changes: 3 additions & 0 deletions crates/bevy_animation/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,10 @@ fn apply_animation(
let Some(target) = entity_from_path(root, path, children, names, cached_path) else {
continue;
};
<<<<<<< HEAD
any_path_found = true;
=======
>>>>>>> 165c47071 (Fix CI for Rust 1.72 (#9562))
// SAFETY: The verify_no_ancestor_player check above ensures that two animation players cannot alias
// any of their descendant Transforms.
//
Expand Down
4 changes: 4 additions & 0 deletions crates/bevy_pbr/src/prepass/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,11 @@ pub fn queue_prepass_material_meshes<M: Material>(
let rangefinder = view.rangefinder3d();

for visible_entity in &visible_entities.entities {
<<<<<<< HEAD
let Ok((material_handle, mesh_handle, mesh_transforms)) =
=======
let Ok((material_handle, mesh_handle, mesh_transforms, batch_indices)) =
>>>>>>> 165c47071 (Fix CI for Rust 1.72 (#9562))
material_meshes.get(*visible_entity)
else {
continue;
Expand Down

0 comments on commit 069db4b

Please sign in to comment.