diff options
| author | bors <bors@rust-lang.org> | 2015-01-08 18:40:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-08 18:40:04 +0000 |
| commit | 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6 (patch) | |
| tree | b7ebe956eeb308942c79bb1cd8ca1c4fc016fe83 /src/libstd/rt | |
| parent | a8a210b57ef6b2f5f66b8798c80acfde70c9d2e7 (diff) | |
| parent | 7541f82faba6b2839b5e640605d7caab6cc6ec4f (diff) | |
| download | rust-00b112c45a604fa6f4b59af2a40c9deeadfdb7c6.tar.gz rust-00b112c45a604fa6f4b59af2a40c9deeadfdb7c6.zip | |
auto merge of #20760 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/unwind.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs index 5ef55f5b487..e3e4e132b81 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -16,7 +16,7 @@ //! and should be considered as private implementation details for the //! time being. -#![experimental] +#![unstable] // FIXME: this should not be here. #![allow(missing_docs)] diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 03876189da9..4cd0b29688a 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -582,7 +582,7 @@ fn begin_unwind_inner(msg: Box<Any + Send>, file_line: &(&'static str, uint)) -> /// Only a limited number of callbacks can be registered, and this function /// returns whether the callback was successfully registered or not. It is not /// currently possible to unregister a callback once it has been registered. -#[experimental] +#[unstable] pub unsafe fn register(f: Callback) -> bool { match CALLBACK_CNT.fetch_add(1, Ordering::SeqCst) { // The invocation code has knowledge of this window where the count has |
