From 7b61696adbaed0bdd3577e7b6b8fb3d999e14bbc Mon Sep 17 00:00:00 2001 From: Graham MacDonald Date: Fri, 7 Jun 2024 20:48:41 +0100 Subject: [PATCH] Bump rust forward by 5 months Signed-off-by: Graham MacDonald --- .cargo/{config => config.toml} | 0 aarch64/src/mailbox.rs | 1 + aarch64/src/main.rs | 2 -- aarch64/src/vm.rs | 1 + lib/x86_64-unknown-none-elf.json | 4 ++-- port/src/lib.rs | 1 - rust-toolchain.toml | 2 +- 7 files changed, 5 insertions(+), 6 deletions(-) rename .cargo/{config => config.toml} (100%) diff --git a/.cargo/config b/.cargo/config.toml similarity index 100% rename from .cargo/config rename to .cargo/config.toml diff --git a/aarch64/src/mailbox.rs b/aarch64/src/mailbox.rs index 51ed579..0d9f679 100644 --- 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 index fee031c..43f98cd 100644 --- 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 index 411332c..02c8c52 100644 --- 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 index b312674..ab08610 100644 --- 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" ] } -} +} \ No newline at end of file diff --git a/port/src/lib.rs b/port/src/lib.rs index 9fa7e0d..8120f05 100644 --- 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 index 9cd1ac4..2ba97e6 100644 --- 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",