Merge #53

53: fix rust fmt to not mangle externs r=Disasm a=almindor

Cargo fmt mangled all the `extern "Rust"` cases, this fixes it and cleans up the code.

Co-authored-by: Ales Katona <[email protected]>

Author: bors[bot]

riscv-rt/build.rs

@@ -16,12 +16,13 @@ fn main() {
         let mut target = Target::from_target_str(&target);
         target.retain_extensions("imc");
 
-        let target = target.to_string();    
+        let target = target.to_string();
 
         fs::copy(
             format!("bin/{}.a", target),
             out_dir.join(format!("lib{}.a", name)),
-        ).unwrap();
+        )
+        .unwrap();
 
         println!("cargo:rustc-link-lib=static={}", name);
         println!("cargo:rustc-link-search={}", out_dir.display());

riscv-rt/examples/empty.rs

@@ -9,5 +9,5 @@ use riscv_rt::entry;
 #[entry]
 fn main() -> ! {
     // do something here
-    loop { }
+    loop {}
 }

riscv-rt/examples/multi_core.rs

@@ -5,11 +5,12 @@ extern crate panic_halt;
 extern crate riscv;
 extern crate riscv_rt;
 
-use riscv::register::{mie, mip, mhartid};
 use riscv::asm::wfi;
+use riscv::register::{mhartid, mie, mip};
 use riscv_rt::entry;
 
 #[export_name = "_mp_hook"]
+#[rustfmt::skip]
 pub extern "Rust" fn user_mp_hook() -> bool {
     let hartid = mhartid::read();
     if hartid == 0 {
@@ -52,5 +53,5 @@ fn main() -> ! {
         }
     }
 
-    loop { }
+    loop {}
 }

riscv-rt/src/lib.rs

@@ -330,9 +330,9 @@
 #![no_std]
 #![deny(missing_docs)]
 
+extern crate r0;
 extern crate riscv;
 extern crate riscv_rt_macros as macros;
-extern crate r0;
 
 pub use macros::{entry, pre_init};
 
@@ -355,14 +355,14 @@ extern "C" {
     static _sidata: u32;
 }
 
-
 /// Rust entry point (_start_rust)
 ///
 /// Zeros bss section, initializes data section and calls main. This function
 /// never returns.
 #[link_section = ".init.rust"]
 #[export_name = "_start_rust"]
 pub unsafe extern "C" fn start_rust() -> ! {
+    #[rustfmt::skip]
     extern "Rust" {
         // This symbol will be provided by the user via `#[entry]`
         fn main() -> !;
@@ -407,7 +407,6 @@ pub struct TrapFrame {
     pub a7: usize,
 }
 
-
 /// Trap entry point rust (_start_trap_rust)
 ///
 /// `mcause` is read to determine the cause of the trap. XLEN-1 bit indicates
@@ -501,25 +500,41 @@ pub union Vector {
 #[no_mangle]
 pub static __INTERRUPTS: [Vector; 12] = [
     Vector { handler: UserSoft },
-    Vector { handler: SupervisorSoft },
+    Vector {
+        handler: SupervisorSoft,
+    },
     Vector { reserved: 0 },
-    Vector { handler: MachineSoft },
+    Vector {
+        handler: MachineSoft,
+    },
     Vector { handler: UserTimer },
-    Vector { handler: SupervisorTimer },
+    Vector {
+        handler: SupervisorTimer,
+    },
     Vector { reserved: 0 },
-    Vector { handler: MachineTimer },
-    Vector { handler: UserExternal },
-    Vector { handler: SupervisorExternal },
+    Vector {
+        handler: MachineTimer,
+    },
+    Vector {
+        handler: UserExternal,
+    },
+    Vector {
+        handler: SupervisorExternal,
+    },
     Vector { reserved: 0 },
-    Vector { handler: MachineExternal },
+    Vector {
+        handler: MachineExternal,
+    },
 ];
 
 #[doc(hidden)]
 #[no_mangle]
+#[rustfmt::skip]
 pub unsafe extern "Rust" fn default_pre_init() {}
 
 #[doc(hidden)]
 #[no_mangle]
+#[rustfmt::skip]
 pub extern "Rust" fn default_mp_hook() -> bool {
     use riscv::register::mhartid;
     match mhartid::read() {