diff options
| author | bors <bors@rust-lang.org> | 2019-01-06 15:40:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-06 15:40:58 +0000 |
| commit | b92552d5578e4544006da0dd5e793a19c2149321 (patch) | |
| tree | ccd13a9b9aadec38dd3818d22052a9cac38d15ed /src/test/ui/issues | |
| parent | 6b2c3117184e9fff432e84f8d75417056d757113 (diff) | |
| parent | 37511771dbc4f9454b0e6624f7e9966a1441b7ce (diff) | |
| download | rust-b92552d5578e4544006da0dd5e793a19c2149321.tar.gz rust-b92552d5578e4544006da0dd5e793a19c2149321.zip | |
Auto merge of #57272 - petrochenkov:featrecov, r=estebank
Make sure feature gate errors are recoverable (take 2) Continuation of https://github.com/rust-lang/rust/pull/56999/commits/15cefe4b2a65bb2a4febcd353cb37b90dfafa4f1. Turns out I missed the most important part - the main feature gate checking pass.
Diffstat (limited to 'src/test/ui/issues')
| -rw-r--r-- | src/test/ui/issues/issue-51279.rs | 4 | ||||
| -rw-r--r-- | src/test/ui/issues/issue-51279.stderr | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/test/ui/issues/issue-51279.rs b/src/test/ui/issues/issue-51279.rs index ad5438fbd46..f8f3626caab 100644 --- a/src/test/ui/issues/issue-51279.rs +++ b/src/test/ui/issues/issue-51279.rs @@ -15,7 +15,7 @@ pub struct Y<#[cfg(none)] T>(T); // shouldn't care when the entire item is strip struct M<T>(*const T); -unsafe impl<#[cfg_attr(none, may_dangle)] T> Drop for M<T> { +impl<#[cfg_attr(none, may_dangle)] T> Drop for M<T> { //~^ ERROR #[cfg_attr] cannot be applied on a generic parameter fn drop(&mut self) {} } @@ -23,3 +23,5 @@ unsafe impl<#[cfg_attr(none, may_dangle)] T> Drop for M<T> { type Z<#[ignored] 'a, #[cfg(none)] T> = X<'a, T>; //~^ ERROR #[cfg] cannot be applied on a generic parameter //~| ERROR attribute `ignored` is currently unknown to the compiler + +fn main() {} diff --git a/src/test/ui/issues/issue-51279.stderr b/src/test/ui/issues/issue-51279.stderr index 1706e98e83b..bc33eacac99 100644 --- a/src/test/ui/issues/issue-51279.stderr +++ b/src/test/ui/issues/issue-51279.stderr @@ -35,10 +35,10 @@ LL | pub fn f<#[cfg(none)] 'a, #[cfg(none)] T>(_: &'a T) {} | ^^^^^^^^^^^^ error: #[cfg_attr] cannot be applied on a generic parameter - --> $DIR/issue-51279.rs:18:13 + --> $DIR/issue-51279.rs:18:6 | -LL | unsafe impl<#[cfg_attr(none, may_dangle)] T> Drop for M<T> { - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +LL | impl<#[cfg_attr(none, may_dangle)] T> Drop for M<T> { + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: #[cfg] cannot be applied on a generic parameter --> $DIR/issue-51279.rs:23:23 |