add cargo fmt in Makefile, and exec make fmt

Makefile

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

easy-fs-fuse/src/main.rs

@@ -24,7 +24,9 @@ impl BlockDevice for BlockFile {
         assert_eq!(file.write(buf).unwrap(), BLOCK_SZ, "Not a complete block!");
     }
 
-    fn handle_irq(&self) { unimplemented!(); }
+    fn handle_irq(&self) {
+        unimplemented!();
+    }
 }
 
 fn main() {

os/src/boards/qemu.rs

@@ -69,7 +69,6 @@ pub trait QEMUExit {
     fn exit_failure(&self) -> !;
 }
 
-
 /// RISCV64 configuration
 pub struct RISCV64 {
     /// Address of the sifive_test mapped device.

user/src/bin/eisenberg.rs

@@ -7,16 +7,18 @@ extern crate user_lib;
 extern crate alloc;
 extern crate core;
 
-use user_lib::{thread_create, waittid, exit, sleep};
 use alloc::vec::Vec;
 use core::sync::atomic::{AtomicUsize, Ordering};
+use user_lib::{exit, sleep, thread_create, waittid};
 
 const N: usize = 2;
 const THREAD_NUM: usize = 10;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 enum FlagState {
-    Out, Want, In,
+    Out,
+    Want,
+    In,
 }
 
 static mut TURN: usize = 0;
@@ -56,8 +58,11 @@ fn eisenberg_enter_critical(id: usize) {
             if prior_thread.is_none() {
                 break;
             }
-            println!("Thread[{}]: prior thread {} exist, sleep and retry", 
-                      id, prior_thread.unwrap());
+            println!(
+                "Thread[{}]: prior thread {} exist, sleep and retry",
+                id,
+                prior_thread.unwrap()
+            );
             sleep(1);
         }
         /* now tentatively claim the resource */

user/src/bin/forktree.rs

@@ -4,7 +4,7 @@
 #[macro_use]
 extern crate user_lib;
 
-use user_lib::{exit, fork, getpid, sleep, yield_, wait};
+use user_lib::{exit, fork, getpid, sleep, wait, yield_};
 
 const DEPTH: usize = 4;
 

user/src/bin/peterson.rs

@@ -8,9 +8,9 @@ extern crate user_lib;
 extern crate alloc;
 extern crate core;
 
-use user_lib::{thread_create, waittid, exit, sleep};
-use core::sync::atomic::{AtomicUsize, Ordering};
 use alloc::vec::Vec;
+use core::sync::atomic::{AtomicUsize, Ordering};
+use user_lib::{exit, sleep, thread_create, waittid};
 const N: usize = 3;
 
 static mut TURN: usize = 0;

user/src/bin/usertests.rs

@@ -115,7 +115,11 @@ pub fn main() -> i32 {
     let succ_num = run_tests(SUCC_TESTS);
     let err_num = run_tests(FAIL_TESTS);
     if succ_num == SUCC_TESTS.len() as i32 && err_num == FAIL_TESTS.len() as i32 {
-        println!("{} of sueecssed apps, {} of failed apps run correctly. \nUsertests passed!", SUCC_TESTS.len(), FAIL_TESTS.len() );
+        println!(
+            "{} of sueecssed apps, {} of failed apps run correctly. \nUsertests passed!",
+            SUCC_TESTS.len(),
+            FAIL_TESTS.len()
+        );
         return 0;
     }
     if succ_num != SUCC_TESTS.len() as i32 {