Update MSRV from 1.85.0 to 1.87.0 and Rebase

bevy_reflect: Update MSRV from 1.85.0 to 1.87.0

Author: Diddykonga

crates/bevy_reflect/Cargo.toml

@@ -7,7 +7,7 @@ homepage = "https://bevy.org"
 repository = "https://github.com/bevyengine/bevy"
 license = "MIT OR Apache-2.0"
 keywords = ["bevy"]
-rust-version = "1.85.0"
+rust-version = "1.87.0"
 
 [features]
 default = ["std", "smallvec", "indexmap", "debug", "auto_register_inventory"]
@@ -57,14 +57,14 @@ wgpu-types = ["dep:wgpu-types"]
 ## on `no_std` targets, but provides access to certain additional features on
 ## supported platforms.
 std = [
-  "erased-serde/std",
-  "downcast-rs/std",
-  "serde/std",
-  "glam?/std",
-  "smol_str?/std",
-  "uuid?/std",
-  "bevy_platform/std",
-  "wgpu-types?/std",
+    "erased-serde/std",
+    "downcast-rs/std",
+    "serde/std",
+    "glam?/std",
+    "smol_str?/std",
+    "uuid?/std",
+    "bevy_platform/std",
+    "wgpu-types?/std",
 ]
 
 ## `critical-section` provides the building blocks for synchronization primitives
@@ -76,15 +76,15 @@ critical-section = ["bevy_platform/critical-section"]
 auto_register = []
 ## Enables automatic reflect registration using inventory. Not supported on all platforms.
 auto_register_inventory = [
-  "auto_register",
-  "bevy_reflect_derive/auto_register_inventory",
-  "dep:inventory",
+    "auto_register",
+    "bevy_reflect_derive/auto_register_inventory",
+    "dep:inventory",
 ]
 ## Enable automatic reflect registration without inventory. This feature has precedence over `auto_register_inventory`.
 ## See `load_type_registrations` for more info.
 auto_register_static = [
-  "auto_register",
-  "bevy_reflect_derive/auto_register_static",
+    "auto_register",
+    "bevy_reflect_derive/auto_register_static",
 ]
 
 ## Enables use of browser APIs.
@@ -97,8 +97,8 @@ bevy_reflect_derive = { path = "derive", version = "0.19.0-dev" }
 bevy_utils = { path = "../bevy_utils", version = "0.19.0-dev", default-features = false }
 bevy_ptr = { path = "../bevy_ptr", version = "0.19.0-dev" }
 bevy_platform = { path = "../bevy_platform", version = "0.19.0-dev", default-features = false, features = [
-  "alloc",
-  "serialize",
+    "alloc",
+    "serialize",
 ] }
 
 # used by bevy-utils, but it also needs reflect impls
@@ -107,7 +107,7 @@ hashbrown = { version = "0.16.0", optional = true, default-features = false }
 
 # other
 erased-serde = { version = "0.4", default-features = false, features = [
-  "alloc",
+    "alloc",
 ] }
 disqualified = { version = "1.0", default-features = false }
 downcast-rs = { version = "2", default-features = false }
@@ -117,20 +117,20 @@ serde = { version = "1", default-features = false, features = ["alloc"] }
 assert_type_match = "0.1.1"
 smallvec = { version = "1", default-features = false, optional = true }
 glam = { version = "0.31.0", default-features = false, features = [
-  "serde",
+    "serde",
 ], optional = true }
 indexmap = { version = "2.5.0", default-features = false, optional = true }
 petgraph = { version = "0.8", features = ["serde-1"], optional = true }
 smol_str = { version = "0.2.0", default-features = false, features = [
-  "serde",
+    "serde",
 ], optional = true }
 uuid = { version = "1.13.1", default-features = false, optional = true, features = [
-  "v4",
-  "serde",
+    "v4",
+    "serde",
 ] }
 variadics_please = "1.1"
 wgpu-types = { version = "28", features = [
-  "serde",
+    "serde",
 ], optional = true, default-features = false }
 
 # deps for automatic type registration

crates/bevy_reflect/src/structs.rs

@@ -336,10 +336,6 @@ impl DynamicStruct {
         index: usize,
     ) -> Option<(Cow<'static, str>, Box<dyn PartialReflect>)> {
         let mut i: usize = 0;
-        #[expect(
-            clippy::incompatible_msrv,
-            reason = "MSRV is 1.85 and `extract_if` is Stable in 1.87"
-        )]
         let mut extract = self.field_names.extract_if(0..self.field_names.len(), |n| {
             let mut result = false;
             if i == index {