diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-01-06 22:33:37 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-01-07 23:51:38 -0800 |
| commit | bcb1c381a38f8f36a71323bbf12d55afc8627d90 (patch) | |
| tree | 845fbeceb532354888cb7b3cad9c184e249afc9a /src/libstd/rt | |
| parent | c4d36b85a0181575319168ab080989c71b935b20 (diff) | |
| download | rust-bcb1c381a38f8f36a71323bbf12d55afc8627d90.tar.gz rust-bcb1c381a38f8f36a71323bbf12d55afc8627d90.zip | |
stdtest: Fix all leaked trait imports
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/unwind.rs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 56dc2288a40..3a07e8c373b 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -77,6 +77,7 @@ mod libunwind { //! Unwind library interface #[allow(non_camel_case_types)]; + #[allow(dead_code)] // these are just bindings use libc::{uintptr_t, uint64_t}; @@ -262,7 +263,8 @@ fn rust_exception_class() -> uw::_Unwind_Exception_Class { // This is achieved by overriding the return value in search phase to always // say "catch!". -#[cfg(not(target_arch = "arm"))] +#[cfg(not(target_arch = "arm"), not(test))] +#[doc(hidden)] pub mod eabi { use uw = super::libunwind; use libc::c_int; @@ -278,8 +280,6 @@ pub mod eabi { #[lang="eh_personality"] #[no_mangle] // so we can reference it by name from middle/trans/base.rs - #[doc(hidden)] - #[cfg(not(test))] pub extern "C" fn rust_eh_personality( version: c_int, actions: uw::_Unwind_Action, @@ -295,8 +295,6 @@ pub mod eabi { } #[no_mangle] // referenced from rust_try.ll - #[doc(hidden)] - #[cfg(not(test))] pub extern "C" fn rust_eh_personality_catch( version: c_int, actions: uw::_Unwind_Action, @@ -319,7 +317,7 @@ pub mod eabi { // ARM EHABI uses a slightly different personality routine signature, // but otherwise works the same. -#[cfg(target_arch = "arm")] +#[cfg(target_arch = "arm", not(test))] pub mod eabi { use uw = super::libunwind; use libc::c_int; @@ -333,8 +331,6 @@ pub mod eabi { #[lang="eh_personality"] #[no_mangle] // so we can reference it by name from middle/trans/base.rs - #[doc(hidden)] - #[cfg(not(test))] pub extern "C" fn rust_eh_personality( state: uw::_Unwind_State, ue_header: *uw::_Unwind_Exception, @@ -347,8 +343,6 @@ pub mod eabi { } #[no_mangle] // referenced from rust_try.ll - #[doc(hidden)] - #[cfg(not(test))] pub extern "C" fn rust_eh_personality_catch( state: uw::_Unwind_State, ue_header: *uw::_Unwind_Exception, |