Update rust toolchain

.github/workflows/rust.yml

@@ -14,12 +14,7 @@ jobs:
           ~/.cargo/git
           target
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-    - uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
     - run: sudo apt-get -qqy update
     - run: sudo apt-get -qqy install qemu-system-x86
-    - run: rustup component add rust-src
-    - run: rustup component add llvm-tools-preview
-    - run: cargo install bootimage
+    - run: make
     - run: make test

Cargo.toml

@@ -21,7 +21,7 @@ acpi = "4.1.0"
 aml = "0.16.1"
 base64 = { version = "0.13.0", default-features = false }
 bit_field = "0.10.0"
-bootloader = { version = "0.9.21", features = ["map_physical_memory"] }
+bootloader = { version = "0.9.22", features = ["map_physical_memory"] }
 float-cmp = "0.9.0"
 hmac = { version = "0.12.1", default-features = false }
 lazy_static = { version = "1.4.0", features = ["spin_no_std"] }

Makefile

@@ -2,11 +2,9 @@
 .EXPORT_ALL_VARIABLES:
 
 setup:
-	curl https://sh.rustup.rs -sSf | sh
+	curl https://sh.rustup.rs -sSf | sh -s -- -y
 	rustup install nightly
 	rustup default nightly
-	rustup component add rust-src
-	rustup component add llvm-tools-preview
 	cargo install bootimage
 
 output = video

README.md

@@ -60,8 +60,6 @@ Install the required tools with `make setup` or the following commands:
     $ curl https://sh.rustup.rs -sSf | sh
     $ rustup install nightly
     $ rustup default nightly
-    $ rustup component add rust-src
-    $ rustup component add llvm-tools-preview
     $ cargo install bootimage
 
 

rust-toolchain.toml

@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly-2022-04-04"
+components = ["rust-src", "llvm-tools-preview"]

src/lib.rs

@@ -2,11 +2,9 @@
 #![cfg_attr(test, no_main)]
 #![feature(abi_x86_interrupt)]
 #![feature(alloc_error_handler)]
-#![feature(asm)]
 #![feature(asm_sym)]
 #![feature(naked_functions)]
 #![feature(custom_test_frameworks)]
-#![feature(destructuring_assignment)]
 #![test_runner(crate::test_runner)]
 #![reexport_test_harness_main = "test_main"]
 

src/sys/idt.rs

@@ -1,6 +1,7 @@
 use crate::sys;
 use crate::sys::process::Registers;
 
+use core::arch::asm;
 use lazy_static::lazy_static;
 use spin::Mutex;
 use x86_64::instructions::interrupts;

src/sys/process.rs

@@ -5,6 +5,7 @@ use alloc::boxed::Box;
 use alloc::collections::btree_map::BTreeMap;
 use alloc::string::{String, ToString};
 use alloc::vec::Vec;
+use core::arch::asm;
 use core::sync::atomic::{AtomicUsize, Ordering};
 use lazy_static::lazy_static;
 use object::{Object, ObjectSegment};

src/sys/syscall/mod.rs

@@ -4,6 +4,8 @@ pub mod service;
 use crate::sys;
 use crate::sys::fs::FileInfo;
 
+use core::arch::asm;
+
 /*
  * Dispatching system calls
  */