diff options
| author | Srinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com> | 2016-05-29 21:04:21 +0530 |
|---|---|---|
| committer | Srinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com> | 2016-05-29 21:04:21 +0530 |
| commit | 36964d4d2adf002cbfe42fae083fc386fb84d055 (patch) | |
| tree | 378b67d82b3f6c4cba753803546c211a7a9c9efa | |
| parent | aee3073bd9c02a0ae8ccf1f292ef36ae49ab10ac (diff) | |
| download | rust-36964d4d2adf002cbfe42fae083fc386fb84d055.tar.gz rust-36964d4d2adf002cbfe42fae083fc386fb84d055.zip | |
run rustfmt on rtstartup folder
| -rw-r--r-- | src/rtstartup/rsbegin.rs | 8 | ||||
| -rw-r--r-- | src/rtstartup/rsend.rs | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/rtstartup/rsbegin.rs b/src/rtstartup/rsbegin.rs index d1b6fe6655a..150abc226e6 100644 --- a/src/rtstartup/rsbegin.rs +++ b/src/rtstartup/rsbegin.rs @@ -27,8 +27,7 @@ #![allow(non_camel_case_types)] #[cfg(all(target_os="windows", target_arch = "x86", target_env="gnu"))] -pub mod eh_frames -{ +pub mod eh_frames { #[no_mangle] #[link_section = ".eh_frame"] // Marks beginning of the stack frame unwind info section @@ -40,7 +39,7 @@ pub mod eh_frames // Unwind info registration/deregistration routines. // See the docs of `unwind` module in libstd. - extern { + extern "C" { fn rust_eh_register_frames(eh_frame_begin: *const u8, object: *mut u8); fn rust_eh_unregister_frames(eh_frame_begin: *const u8, object: *mut u8); } @@ -58,8 +57,7 @@ pub mod eh_frames } // MSVC-specific init/uninit routine registration - pub mod ms_init - { + pub mod ms_init { // .CRT$X?? sections are roughly analogous to ELF's .init_array and .fini_array, // except that they exploit the fact that linker will sort them alphabitically, // so e.g. sections with names between .CRT$XIA and .CRT$XIZ are guaranteed to be diff --git a/src/rtstartup/rsend.rs b/src/rtstartup/rsend.rs index 5e4e13ebd05..915c2355b04 100644 --- a/src/rtstartup/rsend.rs +++ b/src/rtstartup/rsend.rs @@ -14,8 +14,7 @@ #![no_std] #[cfg(all(target_os="windows", target_arch = "x86", target_env="gnu"))] -pub mod eh_frames -{ +pub mod eh_frames { // Terminate the frame unwind info section with a 0 as a sentinel; // this would be the 'length' field in a real FDE. #[no_mangle] |