diff options
| author | bors <bors@rust-lang.org> | 2015-05-10 05:32:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-10 05:32:20 +0000 |
| commit | 750f2c63f2737305d33288303cdecb7a470a7922 (patch) | |
| tree | c4b7b0a038d5c0d9e83ac7ba40ad9332b5273b13 /src/libstd | |
| parent | dc630d01e3eae8ba05db98383119bc2ddbbb01c1 (diff) | |
| parent | 2274bf126ae5aa9c3d010b5117118d61bda64972 (diff) | |
| download | rust-750f2c63f2737305d33288303cdecb7a470a7922.tar.gz rust-750f2c63f2737305d33288303cdecb7a470a7922.zip | |
Auto merge of #25262 - Manishearth:rollup, r=Manishearth
- Successful merges: #25200, #25242, #25248, #25249, #25251, #25252, #25261 - Failed merges: #25255
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/rt/unwind.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 8e55ff0b76c..b24099505ed 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -238,7 +238,7 @@ pub mod eabi { -> uw::_Unwind_Reason_Code; } - #[lang="eh_personality"] + #[lang = "eh_personality"] #[no_mangle] // referenced from rust_try.ll #[allow(private_no_mangle_fns)] extern fn rust_eh_personality( @@ -292,7 +292,7 @@ pub mod eabi { -> uw::_Unwind_Reason_Code; } - #[lang="eh_personality"] + #[lang = "eh_personality"] #[no_mangle] // referenced from rust_try.ll pub extern "C" fn rust_eh_personality( version: c_int, @@ -345,7 +345,7 @@ pub mod eabi { -> uw::_Unwind_Reason_Code; } - #[lang="eh_personality"] + #[lang = "eh_personality"] #[no_mangle] // referenced from rust_try.ll #[allow(private_no_mangle_fns)] extern "C" fn rust_eh_personality( @@ -432,7 +432,7 @@ pub mod eabi { ) -> EXCEPTION_DISPOSITION; } - #[lang="eh_personality"] + #[lang = "eh_personality"] #[no_mangle] // referenced from rust_try.ll #[allow(private_no_mangle_fns)] extern "C" fn rust_eh_personality( |