about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-10-05 07:40:36 +0000
committerbors <bors@rust-lang.org>2018-10-05 07:40:36 +0000
commit61f5ca7d6419ecd22dc4c0eaf2902d7fe7db4323 (patch)
tree7abf0dab8cabc00fcfef57072a25614858a91fb3 /src/liballoc
parentb8bea5a0a6aef3966008787a25949344f8cf6942 (diff)
parent8c6d08b71f56541a540d365746aab460862d3149 (diff)
downloadrust-61f5ca7d6419ecd22dc4c0eaf2902d7fe7db4323.tar.gz
rust-61f5ca7d6419ecd22dc4c0eaf2902d7fe7db4323.zip
Auto merge of #54703 - davidtwco:issue-52086, r=nikomatsakis
error message when trying to move from an Rc or Arc is ungreat

Fixes #52086.

r? @nikomatsakis
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/rc.rs1
-rw-r--r--src/liballoc/sync.rs1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs
index 9d951691a34..915b8e7787e 100644
--- a/src/liballoc/rc.rs
+++ b/src/liballoc/rc.rs
@@ -282,6 +282,7 @@ struct RcBox<T: ?Sized> {
 /// type `T`.
 ///
 /// [get_mut]: #method.get_mut
+#[cfg_attr(all(not(stage0), not(test)), lang = "rc")]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub struct Rc<T: ?Sized> {
     ptr: NonNull<RcBox<T>>,
diff --git a/src/liballoc/sync.rs b/src/liballoc/sync.rs
index 116393bdad1..9e245fbd7bb 100644
--- a/src/liballoc/sync.rs
+++ b/src/liballoc/sync.rs
@@ -199,6 +199,7 @@ const MAX_REFCOUNT: usize = (isize::MAX) as usize;
 /// counting in general.
 ///
 /// [rc_examples]: ../../std/rc/index.html#examples
+#[cfg_attr(all(not(stage0), not(test)), lang = "arc")]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub struct Arc<T: ?Sized> {
     ptr: NonNull<ArcInner<T>>,