Upgrade to rust 1.87

Author: alevy

Cargo.toml

@@ -13,7 +13,7 @@ version = "0.1.0"
 [workspace.package]
 # This must be kept in sync with rust-toolchain.toml; please see that file for
 # more information.
-rust-version = "1.84"
+rust-version = "1.87"
 
 [features]
 rust_embedded = [

nightly/rust-toolchain.toml

@@ -1,4 +1,4 @@
 # This is the nightly Rust toolchain used by `make test`.
 [toolchain]
-channel = "nightly-2024-11-11"
+channel = "nightly-2025-05-19"
 components = ["miri", "rust-src"]

rust-toolchain.toml

@@ -5,7 +5,7 @@
 # you'd like to use. When you do so, update this to the first Rust version that
 # includes that feature. Whenever this value is updated, the rust-version field
 # in Cargo.toml must be updated as well.
-channel = "1.84"
+channel = "1.87"
 components = ["clippy", "rustfmt" ]
 targets = [
     "thumbv6m-none-eabi",

unittest/src/share_data.rs

@@ -174,7 +174,10 @@ mod tests {
                     subscribe_num: 2
                 }
             );
-            assert!(upcall_queue_entry.upcall.fn_pointer == Some(upcall_ptr));
+            assert!(
+                upcall_queue_entry.upcall.fn_pointer.map(|f| f as *const ())
+                    == Some(upcall_ptr as *const _)
+            );
             let data: usize = upcall_queue_entry.upcall.data.into();
             assert_eq!(data, 1111);
 
@@ -207,7 +210,10 @@ mod tests {
                     subscribe_num: 2
                 }
             );
-            assert!(front_queue_entry.upcall.fn_pointer == Some(upcall_ptr));
+            assert!(
+                front_queue_entry.upcall.fn_pointer.map(|f| f as *const ())
+                    == Some(upcall_ptr as *const _)
+            );
             let front_data: usize = front_queue_entry.upcall.data.into();
             assert_eq!(front_data, 1111);
             let back_queue_entry = kernel_data.upcall_queue.back().expect("Upcall not queued");
@@ -219,7 +225,10 @@ mod tests {
                     subscribe_num: 2
                 }
             );
-            assert!(back_queue_entry.upcall.fn_pointer == Some(upcall_ptr));
+            assert!(
+                back_queue_entry.upcall.fn_pointer.map(|f| f as *const ())
+                    == Some(upcall_ptr as *const _)
+            );
             let back_data: usize = back_queue_entry.upcall.data.into();
             assert_eq!(back_data, 2222);
         });