summary refs log tree commit diff
path: root/library/alloc/src
diff options
context:
space:
mode:
authorJoshua Nelson <jyn514@gmail.com>2021-01-15 15:21:20 -0500
committerJoshua Nelson <jyn514@gmail.com>2021-01-15 17:31:10 -0500
commitc819a4c0255fc8857ebadb74763edd9b9f9c9601 (patch)
tree063948cf35b251a4c5314f46da46cb1bfdb27fd8 /library/alloc/src
parent5053db7c006a22060fc87c227339ddc6ee8d8ec0 (diff)
downloadrust-c819a4c0255fc8857ebadb74763edd9b9f9c9601.tar.gz
rust-c819a4c0255fc8857ebadb74763edd9b9f9c9601.zip
Don't mark `ineffective_unstable_trait_impl` as an internal lint
It's not an internal lint:
- It's not in the rustc::internal lint group
- It's on unconditionally, because it actually lints `staged_api`, not
  the compiler

This fixes a bug where `#[deny(rustc::internal)]` would warn that
`rustc::internal` was an unknown lint.
Diffstat (limited to 'library/alloc/src')
-rw-r--r--library/alloc/src/task.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/library/alloc/src/task.rs b/library/alloc/src/task.rs
index fcab3fd0bad..69690494196 100644
--- a/library/alloc/src/task.rs
+++ b/library/alloc/src/task.rs
@@ -33,7 +33,8 @@ pub trait Wake {
     }
 }
 
-#[allow(rustc::ineffective_unstable_trait_impl)]
+#[cfg_attr(bootstrap, allow(rustc::ineffective_unstable_trait_impl))]
+#[cfg_attr(not(bootstrap), allow(ineffective_unstable_trait_impl))]
 #[unstable(feature = "wake_trait", issue = "69912")]
 impl<W: Wake + Send + Sync + 'static> From<Arc<W>> for Waker {
     fn from(waker: Arc<W>) -> Waker {
@@ -43,7 +44,8 @@ impl<W: Wake + Send + Sync + 'static> From<Arc<W>> for Waker {
     }
 }
 
-#[allow(rustc::ineffective_unstable_trait_impl)]
+#[cfg_attr(bootstrap, allow(rustc::ineffective_unstable_trait_impl))]
+#[cfg_attr(not(bootstrap), allow(ineffective_unstable_trait_impl))]
 #[unstable(feature = "wake_trait", issue = "69912")]
 impl<W: Wake + Send + Sync + 'static> From<Arc<W>> for RawWaker {
     fn from(waker: Arc<W>) -> RawWaker {