add cargo fmt in Makefile, and exec make fmt

Makefile

@@ -6,3 +6,5 @@ docker:
 
 build_docker: 
 	docker build -t ${DOCKER_NAME} .
+fmt:
+	cd os ; cargo fmt; cd ../user; cargo fmt; cd ..

os/src/boards/k210.rs

@@ -1,2 +1 @@
 pub const CLOCK_FREQ: usize = 403000000 / 62;
-

os/src/mm/memory_set.rs

@@ -324,26 +324,20 @@ pub fn remap_test() {
     let mid_text: VirtAddr = ((stext as usize + etext as usize) / 2).into();
     let mid_rodata: VirtAddr = ((srodata as usize + erodata as usize) / 2).into();
     let mid_data: VirtAddr = ((sdata as usize + edata as usize) / 2).into();
-    assert!(
-        !kernel_space
+    assert!(!kernel_space
         .page_table
         .translate(mid_text.floor())
         .unwrap()
-            .writable(),
-    );
-    assert!(
-        !kernel_space
+        .writable(),);
+    assert!(!kernel_space
         .page_table
         .translate(mid_rodata.floor())
         .unwrap()
-            .writable(),
-    );
-    assert!(
-        !kernel_space
+        .writable(),);
+    assert!(!kernel_space
         .page_table
         .translate(mid_data.floor())
         .unwrap()
-            .executable(),
-    );
+        .executable(),);
     println!("remap_test passed!");
 }

os/src/mm/mod.rs

@@ -6,7 +6,6 @@
 //!
 //! Every task or process has a memory_set to control its virtual memory.
 
-
 mod address;
 mod frame_allocator;
 mod heap_allocator;

os/src/trap/mod.rs

@@ -64,8 +64,10 @@ pub fn trap_handler() -> ! {
             cx.sepc += 4;
             cx.x[10] = syscall(cx.x[17], [cx.x[10], cx.x[11], cx.x[12]]) as usize;
         }
-        Trap::Exception(Exception::StoreFault) | Trap::Exception(Exception::StorePageFault) |
-        Trap::Exception(Exception::LoadFault)  | Trap::Exception(Exception::LoadPageFault) => {
+        Trap::Exception(Exception::StoreFault)
+        | Trap::Exception(Exception::StorePageFault)
+        | Trap::Exception(Exception::LoadFault)
+        | Trap::Exception(Exception::LoadPageFault) => {
             println!("[kernel] PageFault in application, bad addr = {:#x}, bad instruction = {:#x}, kernel killed it.", stval, cx.sepc);
             exit_current_and_run_next();
         }

user/src/bin/04load_fault.rs

@@ -4,7 +4,7 @@
 #[macro_use]
 extern crate user_lib;
 
-use core::ptr::{read_volatile,null_mut};
+use core::ptr::{null_mut, read_volatile};
 
 #[no_mangle]
 fn main() -> i32 {