Move to Rust 1.92 (#148)

qinsoon · mmtkgc-bot · web-flow · commit b9fecee0502a · 2026-01-09T17:06:08.000+13:00
Co-authored-by: mmtkgc-bot &lt;mmtkgc.bot@gmail.com&gt;
diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
@@ -37,7 +37,7 @@ features = ["is_mmtk_object", "object_pinning", "sticky_immix_non_moving_nursery
 
 # Uncomment the following lines to use mmtk-core from the official repository.
 git = "https://github.com/mmtk/mmtk-core.git"
-rev = "2ad6d36ab3d82be46135a7d76d4fe59cc84620ed"
+rev = "e30d0a0866fe66d352eb09eb7f9e9466dc649172"
 
 # Uncomment the following line to use mmtk-core from a local repository.
 #path = "../../mmtk-core"
diff --git a/mmtk/rust-toolchain b/mmtk/rust-toolchain
@@ -1 +1 @@
-1.83.0
+1.92.0
diff --git a/mmtk/src/abi.rs b/mmtk/src/abi.rs
@@ -182,7 +182,7 @@ impl ObjectClosure {
         F2: 'env + FnOnce() -> T,
     {
         debug_assert!(
-            self.c_function == THE_UNREGISTERED_CLOSURE_FUNC,
+            std::ptr::fn_addr_eq(self.c_function, THE_UNREGISTERED_CLOSURE_FUNC),
             "set_temporarily_and_run_code is recursively called."
         );
         self.c_function = Self::c_function_registered::<F1>;

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ impl ObjectClosure {`
`182`	`182`	`F2: 'env + FnOnce() -> T,`
`183`	`183`	`{`
`184`	`184`	`debug_assert!(`
`185`		`- self.c_function == THE_UNREGISTERED_CLOSURE_FUNC,`
	`185`	`+ std::ptr::fn_addr_eq(self.c_function, THE_UNREGISTERED_CLOSURE_FUNC),`
`186`	`186`	`"set_temporarily_and_run_code is recursively called."`
`187`	`187`	`);`
`188`	`188`	`self.c_function = Self::c_function_registered::<F1>;`