Update rust version

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## Unreleased
+- Update rust version (#495)
 - Fix lisp range params (#494)
 - Fix lisp comments (#493)
 - Add docstring to lisp (#490)

Cargo.toml

@@ -16,7 +16,7 @@ serial = []
 
 [dependencies]
 acpi = "4.1.0"
-aml = "0.16.3"
+aml = "0.16.4"
 base64 = { version = "0.13.1", default-features = false }
 bit_field = "0.10.2"
 bootloader = { version = "0.9.23", features = ["map_physical_memory"] }

Makefile

@@ -2,9 +2,8 @@
 .EXPORT_ALL_VARIABLES:
 
 setup:
-	curl https://sh.rustup.rs -sSf | sh -s -- -y
-	rustup install nightly
-	rustup default nightly
+	curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
+	rustup show
 	cargo install bootimage
 
 # Compilation options
@@ -38,7 +37,7 @@ user-rust:
 		cargo rustc --release --bin {}
 	basename -s .rs src/bin/*.rs | xargs -I {} \
 		cp target/x86_64-moros/release/{} dsk/bin/{}
-	#strip dsk/bin/*
+	strip dsk/bin/*
 
 bin = target/x86_64-moros/$(mode)/bootimage-moros.bin
 img = disk.img

README.md

@@ -51,16 +51,18 @@ Documentation is available [here](doc/index.md)
 
 ## Setup
 
+You will need `git`, `gcc`, `make`, `curl`, `qemu-img`, and
+`qemu-system-x86_64` on the host system.
+
 Clone the repo:
 
     $ git clone https://github.com/vinc/moros
     $ cd moros
 
 Install the required tools with `make setup` or the following commands:
 
-    $ curl https://sh.rustup.rs -sSf | sh
-    $ rustup install nightly
-    $ rustup default nightly
+    $ curl https://sh.rustup.rs -sSf | sh -- --default-toolchain none
+    $ rustup show
     $ cargo install bootimage
 
 

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-12-21"
+channel = "nightly-2023-05-01"
 components = ["rust-src", "llvm-tools-preview"]

src/sys/process.rs

@@ -143,7 +143,7 @@ pub fn code_addr() -> u64 {
 
 pub fn set_code_addr(addr: u64) {
     let mut table = PROCESS_TABLE.write();
-    let mut proc = &mut table[id()];
+    let proc = &mut table[id()];
     proc.code_addr = addr;
 }
 
@@ -164,7 +164,7 @@ pub fn registers() -> Registers {
 
 pub fn set_registers(regs: Registers) {
     let mut table = PROCESS_TABLE.write();
-    let mut proc = &mut table[id()];
+    let proc = &mut table[id()];
     proc.registers = regs
 }
 
@@ -176,7 +176,7 @@ pub fn stack_frame() -> InterruptStackFrameValue {
 
 pub fn set_stack_frame(stack_frame: InterruptStackFrameValue) {
     let mut table = PROCESS_TABLE.write();
-    let mut proc = &mut table[id()];
+    let proc = &mut table[id()];
     proc.stack_frame = stack_frame;
 }