Skip to content

Commit 069db4b

Browse files
rparrettmockersf
authored andcommitted
Fix CI for Rust 1.72 (bevyengine#9562)
[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 <[email protected]>
1 parent 1963e63 commit 069db4b

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

crates/bevy_animation/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,10 @@ fn apply_animation(
625625
let Some(target) = entity_from_path(root, path, children, names, cached_path) else {
626626
continue;
627627
};
628+
<<<<<<< HEAD
628629
any_path_found = true;
630+
=======
631+
>>>>>>> 165c47071 (Fix CI for Rust 1.72 (#9562))
629632
// SAFETY: The verify_no_ancestor_player check above ensures that two animation players cannot alias
630633
// any of their descendant Transforms.
631634
//

crates/bevy_pbr/src/prepass/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,11 @@ pub fn queue_prepass_material_meshes<M: Material>(
798798
let rangefinder = view.rangefinder3d();
799799

800800
for visible_entity in &visible_entities.entities {
801+
<<<<<<< HEAD
801802
let Ok((material_handle, mesh_handle, mesh_transforms)) =
803+
=======
804+
let Ok((material_handle, mesh_handle, mesh_transforms, batch_indices)) =
805+
>>>>>>> 165c47071 (Fix CI for Rust 1.72 (#9562))
802806
material_meshes.get(*visible_entity)
803807
else {
804808
continue;

0 commit comments

Comments
 (0)