aboutsummaryrefslogtreecommitdiff
path: root/ctr-std/src/thread
diff options
context:
space:
mode:
authorRonald Kinard <[email protected]>2017-02-24 13:52:58 -0600
committerGitHub <[email protected]>2017-02-24 13:52:58 -0600
commitd46ab76c6c3768a3f3664c6963acc66e3698b844 (patch)
tree4919df83fb3b67b2c1f4d65196263c05bb249422 /ctr-std/src/thread
parentMerge pull request #20 from panicbit/service_ssl (diff)
parentctr-std: Mark thread::panicking (diff)
downloadctru-rs-d46ab76c6c3768a3f3664c6963acc66e3698b844.tar.xz
ctru-rs-d46ab76c6c3768a3f3664c6963acc66e3698b844.zip
Merge pull request #23 from panicbit/unmarked_api
ctr-std: Mark thread::panicking
Diffstat (limited to 'ctr-std/src/thread')
-rw-r--r--ctr-std/src/thread/mod.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/ctr-std/src/thread/mod.rs b/ctr-std/src/thread/mod.rs
index 8b27bed..a8a6490 100644
--- a/ctr-std/src/thread/mod.rs
+++ b/ctr-std/src/thread/mod.rs
@@ -195,6 +195,8 @@ pub use self::local::{LocalKey, LocalKeyState};
#[doc(hidden)] pub use self::local::os::Key as __OsLocalKeyInner;
// We don't have stack unwinding, so this should always be false
+#[inline]
+#[stable(feature = "rust1", since = "1.0.0")]
pub fn panicking() -> bool {
false
}