about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-23 02:21:53 -0800
committerbors <bors@rust-lang.org>2014-02-23 02:21:53 -0800
commit551da0615764853153db944063ae2e271414a71b (patch)
tree9086a265aa3f85969eb6180566e71a9d991d9e70 /src/libstd/sync
parentc250c16f81f82a21295e421be7bd47c91d64cb2a (diff)
parentdb111846b58253c723750be280a478ed7d27d879 (diff)
downloadrust-551da0615764853153db944063ae2e271414a71b.tar.gz
rust-551da0615764853153db944063ae2e271414a71b.zip
auto merge of #12311 : brson/rust/unstable, r=alexcrichton
With the stability attributes we can put public-but unstable modules next to others, so this moves `intrinsics` and `raw` out of the `unstable` module (and marks both as `#[experimental]`).
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/atomics.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/atomics.rs b/src/libstd/sync/atomics.rs
index 00ce07d747f..b4d465c0397 100644
--- a/src/libstd/sync/atomics.rs
+++ b/src/libstd/sync/atomics.rs
@@ -21,7 +21,7 @@
 
 #[allow(missing_doc)];
 
-use unstable::intrinsics;
+use intrinsics;
 use cast;
 use std::kinds::marker;
 use option::{Option,Some,None};