about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2020-04-10 12:48:45 +0200
committerGitHub <noreply@github.com>2020-04-10 12:48:45 +0200
commit74e93bb8e6cd15dd262868b5e13605e9c595bef7 (patch)
treebd881643cd83bd681ed7c6bbcba55fa3d8cc3d11 /src/liballoc
parent81a360fe9ac1ab3c0685f5b5ebd225189b0312d3 (diff)
parent9d13520a6b00fe239c3990e487cd7449722c0c74 (diff)
downloadrust-74e93bb8e6cd15dd262868b5e13605e9c595bef7.tar.gz
rust-74e93bb8e6cd15dd262868b5e13605e9c595bef7.zip
Rollup merge of #70913 - eddyb:rc-arc-diagnostic-items, r=matthewjasper
Replace "rc"/"arc" lang items with Rc/Arc diagnostic items.

`Rc`/`Arc` should have no special semantics, so it seems appropriate for them to not be lang items.

r? @matthewjasper
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/rc.rs3
-rw-r--r--src/liballoc/sync.rs3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs
index 9db997e8641..abc4056cf56 100644
--- a/src/liballoc/rc.rs
+++ b/src/liballoc/rc.rs
@@ -279,7 +279,8 @@ struct RcBox<T: ?Sized> {
 /// type `T`.
 ///
 /// [get_mut]: #method.get_mut
-#[cfg_attr(not(test), lang = "rc")]
+#[cfg_attr(all(bootstrap, not(test)), lang = "rc")]
+#[cfg_attr(not(test), rustc_diagnostic_item = "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 1cfb26eb35a..b1b22e46a7c 100644
--- a/src/liballoc/sync.rs
+++ b/src/liballoc/sync.rs
@@ -207,7 +207,8 @@ macro_rules! acquire {
 /// counting in general.
 ///
 /// [rc_examples]: ../../std/rc/index.html#examples
-#[cfg_attr(not(test), lang = "arc")]
+#[cfg_attr(all(bootstrap, not(test)), lang = "arc")]
+#[cfg_attr(not(test), rustc_diagnostic_item = "Arc")]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub struct Arc<T: ?Sized> {
     ptr: NonNull<ArcInner<T>>,