Bump rust forward by 5 months

Signed-off-by: Graham MacDonald <[email protected]>
r9os · Jun 7, 2024 · 7b61696 · 7b61696
1 parent 97b2675
commit 7b61696
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 6 deletions.
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
diff --git a/aarch64/src/mailbox.rs b/aarch64/src/mailbox.rs
@@ -185,6 +185,7 @@ struct MemoryResponse {
 
 #[repr(C)]
 #[derive(Debug, Clone, Copy)]
+#[allow(dead_code)]
 pub struct MemoryInfo {
     pub start: u32,
     pub size: u32,

diff --git a/aarch64/src/main.rs b/aarch64/src/main.rs
@@ -5,8 +5,6 @@
 #![feature(alloc_error_handler)]
 #![feature(asm_const)]
 #![feature(core_intrinsics)]
-#![feature(inline_const)]
-#![feature(stdsimd)]
 #![feature(strict_provenance)]
 #![forbid(unsafe_op_in_unsafe_fn)]
 

diff --git a/aarch64/src/vm.rs b/aarch64/src/vm.rs
@@ -273,6 +273,7 @@ fn recursive_table_addr(va: usize, level: Level) -> usize {
 }
 
 #[derive(Debug)]
+#[allow(dead_code)]
 pub enum PageTableError {
     AllocationFailed(BitmapPageAllocError),
     EntryIsNotTable,

diff --git a/lib/x86_64-unknown-none-elf.json b/lib/x86_64-unknown-none-elf.json
@@ -1,6 +1,6 @@
 {
 	"llvm-target": "x86_64-unknown-none-elf",
-	"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",
 	"linker-flavor": "ld.lld",
 	"linker": "rust-lld",
 	"target-endian": "little",
@@ -20,4 +20,4 @@
 			"-nostdlib"
 		]
 	}
-}
+}
diff --git a/port/src/lib.rs b/port/src/lib.rs
@@ -1,6 +1,5 @@
 #![allow(clippy::upper_case_acronyms)]
 #![cfg_attr(not(any(test)), no_std)]
-#![feature(inline_const)]
 #![feature(maybe_uninit_slice)]
 #![feature(step_trait)]
 #![forbid(unsafe_op_in_unsafe_fn)]

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2024-01-30"
+channel = "nightly-2024-06-01"
 components = [ "rustfmt", "rust-src", "clippy", "llvm-tools" ]
 targets = [
   "aarch64-unknown-none",