OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #33950 - srinivasreddy:rtstartup_rustfmt, r=Manishearth 

run rustfmt on rtstartup folder
This commit is contained in:
bors 2016-06-20 02:32:07 -07:00 committed by GitHub
parent 25f349db3e 36964d4d2a
commit 5522e678bc
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rtstartup/rsbegin.rs
View File

@ -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

3
src/rtstartup/rsend.rs
View File

@ -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]