build: Update toolchain to nightly-2024-05-13

With this update, some of the target json definitions need to be updated, and some experimental functions are updated. Signed-off-by: Akira Moroo <[email protected]>
cloud-hypervisor · May 20, 2024 · 97de41f · 97de41f
1 parent 947ab0b
commit 97de41f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/riscv64gcv-unknown-none-elf.json b/riscv64gcv-unknown-none-elf.json
@@ -2,7 +2,7 @@
   "arch": "riscv64",
   "code-model": "medium",
   "cpu": "generic-rv64",
-  "data-layout": "e-m:e-p:64:64-i64:64-i128:128-n64-S128",
+  "data-layout": "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128",
   "eh-frame-header": false,
   "emit-debug-gdb-scripts": false,
   "features": "+m,+a,-f,+d,+c,-v",

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2023-11-11"
+channel = "nightly-2024-05-13"
 components = ["rust-src", "clippy", "rustfmt"]
 targets = [
     "aarch64-unknown-linux-gnu",

diff --git a/src/fat.rs b/src/fat.rs
@@ -5,7 +5,6 @@ use crate::{
     block::{Error as BlockError, SectorBuf, SectorRead},
     mem::MemoryRegion,
 };
-use core::convert::TryFrom;
 
 #[repr(packed)]
 struct Header {

diff --git a/src/main.rs b/src/main.rs
@@ -2,8 +2,8 @@
 // Copyright © 2019 Intel Corporation
 
 #![feature(asm_const)]
+#![feature(exposed_provenance)]
 #![feature(slice_take)]
-#![feature(stdsimd)]
 #![feature(stmt_expr_attributes)]
 #![feature(strict_provenance)]
 #![feature(sync_unsafe_cell)]

diff --git a/src/mem.rs b/src/mem.rs
@@ -40,7 +40,7 @@ impl MemoryRegion {
         T: Copy + Sized,
     {
         assert!((offset + (core::mem::size_of::<T>() - 1) as u64) < self.length);
-        let ptr: *const T = core::ptr::from_exposed_addr((self.base + offset) as usize);
+        let ptr: *const T = core::ptr::with_exposed_provenance((self.base + offset) as usize);
         unsafe { ptr.read_unaligned() }
     }
 
@@ -70,7 +70,7 @@ impl MemoryRegion {
         T: Sized,
     {
         assert!((offset + (core::mem::size_of::<T>() - 1) as u64) < self.length);
-        let ptr: *mut T = core::ptr::from_exposed_addr_mut((self.base + offset) as usize);
+        let ptr: *mut T = core::ptr::with_exposed_provenance_mut((self.base + offset) as usize);
         unsafe { core::ptr::write_unaligned(ptr, value) }
     }
 
@@ -100,7 +100,7 @@ impl MemoryRegion {
         T: Copy + Sized,
     {
         assert!((offset + (core::mem::size_of::<T>() - 1) as u64) < self.length);
-        let ptr: *const T = core::ptr::from_exposed_addr((self.base + offset) as usize);
+        let ptr: *const T = core::ptr::with_exposed_provenance((self.base + offset) as usize);
         unsafe { ptr.read_volatile() }
     }
 
@@ -130,7 +130,7 @@ impl MemoryRegion {
         T: Sized,
     {
         assert!((offset + (core::mem::size_of::<T>() - 1) as u64) < self.length);
-        let ptr: *mut T = core::ptr::from_exposed_addr_mut((self.base + offset) as usize);
+        let ptr: *mut T = core::ptr::with_exposed_provenance_mut((self.base + offset) as usize);
         unsafe { core::ptr::write_volatile(ptr, value) }
     }
 

diff --git a/x86_64-unknown-none.json b/x86_64-unknown-none.json
@@ -1,6 +1,6 @@
 {
   "llvm-target": "x86_64-unknown-none",
-  "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
+  "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
   "arch": "x86_64",
   "target-endian": "little",
   "target-pointer-width": "64",