From 64d025bf36271f07d86c404bb044925fab2cd768 Mon Sep 17 00:00:00 2001 From: Yifan Wu Date: Thu, 2 May 2024 11:04:17 +0800 Subject: [PATCH] toolchain: Bump Rust to 1.80.0-nightly --- os/.cargo/{config => config.toml} | 0 os/src/task/task.rs | 1 + rust-toolchain.toml | 4 ++-- user/.cargo/{config => config.toml} | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename os/.cargo/{config => config.toml} (100%) rename user/.cargo/{config => config.toml} (100%) diff --git a/os/.cargo/config b/os/.cargo/config.toml similarity index 100% rename from os/.cargo/config rename to os/.cargo/config.toml diff --git a/os/src/task/task.rs b/os/src/task/task.rs index 877786c9f..d4a575b85 100644 --- a/os/src/task/task.rs +++ b/os/src/task/task.rs @@ -19,6 +19,7 @@ pub struct TaskControlBlock { pub struct TaskControlBlockInner { pub trap_cx_ppn: PhysPageNum, + #[allow(unused)] pub base_size: usize, pub task_cx: TaskContext, pub task_status: TaskStatus, diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 8193d6fc9..c65d258c2 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,6 +1,6 @@ [toolchain] profile = "minimal" # use the nightly version of the last stable toolchain, see -channel = "nightly-2024-01-18" +channel = "nightly-2024-05-01" components = ["rust-src", "llvm-tools", "rustfmt", "clippy"] -targets = ["riscv64gc-unknown-none-elf"] \ No newline at end of file +targets = ["riscv64gc-unknown-none-elf"] diff --git a/user/.cargo/config b/user/.cargo/config.toml similarity index 100% rename from user/.cargo/config rename to user/.cargo/config.toml