diff options
| author | bors <bors@rust-lang.org> | 2020-04-10 13:05:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-10 13:05:05 +0000 |
| commit | dbc3cfdd25ccd56edf3ea364f86ab32967636c26 (patch) | |
| tree | a75c01452eed404a4610f586ab4efd89938b6107 /src/liballoc/sync.rs | |
| parent | 167510f776891f2b0b18d1168ed42377a63493a7 (diff) | |
| parent | 68e0e6ba848087734be581afe5478635a647aa7c (diff) | |
| download | rust-dbc3cfdd25ccd56edf3ea364f86ab32967636c26.tar.gz rust-dbc3cfdd25ccd56edf3ea364f86ab32967636c26.zip | |
Auto merge of #70983 - Centril:rollup-npabk7c, r=Centril
Rollup of 8 pull requests Successful merges: - #70784 (Consider methods on fundamental `impl` when method is not found on numeric type) - #70843 (Remove the Ord bound that was plaguing drain_filter) - #70913 (Replace "rc"/"arc" lang items with Rc/Arc diagnostic items.) - #70932 (De-abuse TyKind::Error in pattern type checking) - #70952 (Clean up E0511 explanation) - #70964 (rustc_session CLI lint parsing: mark a temporary hack as such) - #70969 (Fix JSON file_name documentation for macros.) - #70975 (Fix internal doc comment nits.) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc/sync.rs')
| -rw-r--r-- | src/liballoc/sync.rs | 3 |
1 files changed, 2 insertions, 1 deletions
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>>, |