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 6c87ddd8..be976390 100644 --- a/os/src/task/task.rs +++ b/os/src/task/task.rs @@ -10,6 +10,7 @@ pub struct TaskControlBlock { pub task_cx: TaskContext, pub memory_set: MemorySet, pub trap_cx_ppn: PhysPageNum, + #[allow(unused)] pub base_size: usize, pub heap_bottom: usize, pub program_brk: usize, diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 8193d6fc..c65d258c 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