Bump to rust nightly-2022-01-01, feature global_asm,asm->stable

os/src/lang_items.rs

@@ -1,4 +1,5 @@
 use core::panic::PanicInfo;
+use core::arch::asm;
 use crate::sbi::shutdown;
 use crate::task::current_kstack_top;
 

os/src/main.rs

@@ -1,7 +1,5 @@
 #![no_std]
 #![no_main]
-#![feature(global_asm)]
-#![feature(asm)]
 #![feature(panic_info_message)]
 #![feature(alloc_error_handler)]
 
@@ -24,6 +22,8 @@ mod mm;
 mod fs;
 mod drivers;
 
+use core::arch::global_asm;
+
 global_asm!(include_str!("entry.asm"));
 
 fn clear_bss() {

os/src/mm/memory_set.rs

@@ -14,6 +14,7 @@ use crate::config::{
     TRAMPOLINE,
     MMIO,
 };
+use core::arch::asm;
 
 extern "C" {
     fn stext();

os/src/sbi.rs

@@ -1,5 +1,7 @@
 #![allow(unused)]
 
+use core::arch::asm;
+
 const SBI_SET_TIMER: usize = 0;
 const SBI_CONSOLE_PUTCHAR: usize = 1;
 const SBI_CONSOLE_GETCHAR: usize = 2;

os/src/task/switch.rs

@@ -1,6 +1,7 @@
-global_asm!(include_str!("switch.S"));
-
 use super::TaskContext;
+use core::arch::global_asm;
+
+global_asm!(include_str!("switch.S"));
 
 extern "C" {
     pub fn __switch(

os/src/trap/mod.rs

@@ -22,6 +22,7 @@ use crate::task::{
 };
 use crate::timer::{set_next_trigger, check_timer};
 use crate::config::TRAMPOLINE;
+use core::arch::{global_asm, asm};
 
 global_asm!(include_str!("trap.S"));
 

rust-toolchain

@@ -1 +1 @@
-nightly-2021-12-15
+nightly-2022-01-01

user/src/lib.rs

@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(asm)]
 #![feature(linkage)]
 #![feature(panic_info_message)]
 #![feature(alloc_error_handler)]

user/src/syscall.rs

@@ -1,3 +1,5 @@
+use core::arch::asm;
+
 const SYSCALL_DUP: usize = 24;
 const SYSCALL_OPEN: usize = 56;
 const SYSCALL_CLOSE: usize = 57;