From 8f1eb345eacae619cf3fdeb17ef7bc6ec581fa2e Mon Sep 17 00:00:00 2001 From: Eduard-Mihai Burtescu Date: Thu, 31 Oct 2019 18:46:29 +0200 Subject: Revert "pre-expansion gate const_generics" This reverts commit 49cbfa1a6f6469ddbc0e88161e52104cc87aea9b. --- .../const-param-in-trait-ungated.stderr | 4 ++-- ...st-param-type-depends-on-type-param-ungated.stderr | 4 ++-- src/test/ui/const-generics/issues/issue-60263.stderr | 4 ++-- .../feature-gate-const_generics-ptr.stderr | 8 ++++---- .../ui/feature-gates/feature-gate-const_generics.rs | 5 ----- .../feature-gates/feature-gate-const_generics.stderr | 19 +++++-------------- 6 files changed, 15 insertions(+), 29 deletions(-) (limited to 'src/test') diff --git a/src/test/ui/const-generics/const-param-in-trait-ungated.stderr b/src/test/ui/const-generics/const-param-in-trait-ungated.stderr index 330c93e83b5..cfb1f8b581c 100644 --- a/src/test/ui/const-generics/const-param-in-trait-ungated.stderr +++ b/src/test/ui/const-generics/const-param-in-trait-ungated.stderr @@ -1,8 +1,8 @@ error[E0658]: const generics are unstable - --> $DIR/const-param-in-trait-ungated.rs:1:13 + --> $DIR/const-param-in-trait-ungated.rs:1:19 | LL | trait Trait {} - | ^^^^^^^^^^^ + | ^ | = note: for more information, see https://github.com/rust-lang/rust/issues/44580 = help: add `#![feature(const_generics)]` to the crate attributes to enable diff --git a/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr b/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr index e34a2da24ce..a2872ab982d 100644 --- a/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr +++ b/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr @@ -1,8 +1,8 @@ error[E0658]: const generics are unstable - --> $DIR/const-param-type-depends-on-type-param-ungated.rs:3:13 + --> $DIR/const-param-type-depends-on-type-param-ungated.rs:3:19 | LL | struct B(PhantomData<[T; N]>); - | ^^^^^^^^^^ + | ^ | = note: for more information, see https://github.com/rust-lang/rust/issues/44580 = help: add `#![feature(const_generics)]` to the crate attributes to enable diff --git a/src/test/ui/const-generics/issues/issue-60263.stderr b/src/test/ui/const-generics/issues/issue-60263.stderr index 5223c8c5137..fe7b6fdb190 100644 --- a/src/test/ui/const-generics/issues/issue-60263.stderr +++ b/src/test/ui/const-generics/issues/issue-60263.stderr @@ -1,8 +1,8 @@ error[E0658]: const generics are unstable - --> $DIR/issue-60263.rs:1:10 + --> $DIR/issue-60263.rs:1:16 | LL | struct B; - | ^^^^^^^^^^^ + | ^ | = note: for more information, see https://github.com/rust-lang/rust/issues/44580 = help: add `#![feature(const_generics)]` to the crate attributes to enable diff --git a/src/test/ui/feature-gates/feature-gate-const_generics-ptr.stderr b/src/test/ui/feature-gates/feature-gate-const_generics-ptr.stderr index 790bc33e268..935f84b9163 100644 --- a/src/test/ui/feature-gates/feature-gate-const_generics-ptr.stderr +++ b/src/test/ui/feature-gates/feature-gate-const_generics-ptr.stderr @@ -1,17 +1,17 @@ error[E0658]: const generics are unstable - --> $DIR/feature-gate-const_generics-ptr.rs:1:16 + --> $DIR/feature-gate-const_generics-ptr.rs:1:22 | LL | struct ConstFn; - | ^^^^^^^^^^^^^ + | ^ | = note: for more information, see https://github.com/rust-lang/rust/issues/44580 = help: add `#![feature(const_generics)]` to the crate attributes to enable error[E0658]: const generics are unstable - --> $DIR/feature-gate-const_generics-ptr.rs:5:17 + --> $DIR/feature-gate-const_generics-ptr.rs:5:23 | LL | struct ConstPtr; - | ^^^^^^^^^^^^^^^^^^^ + | ^ | = note: for more information, see https://github.com/rust-lang/rust/issues/44580 = help: add `#![feature(const_generics)]` to the crate attributes to enable diff --git a/src/test/ui/feature-gates/feature-gate-const_generics.rs b/src/test/ui/feature-gates/feature-gate-const_generics.rs index 0adc9902a69..fe1ded1c4bb 100644 --- a/src/test/ui/feature-gates/feature-gate-const_generics.rs +++ b/src/test/ui/feature-gates/feature-gate-const_generics.rs @@ -2,9 +2,4 @@ fn foo() {} //~ ERROR const generics are unstable struct Foo([(); X]); //~ ERROR const generics are unstable -macro_rules! accept_item { ($i:item) => {} } -accept_item! { - impl A {} //~ ERROR const generics are unstable -} - fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-const_generics.stderr b/src/test/ui/feature-gates/feature-gate-const_generics.stderr index f0154ed289f..468e9c31d37 100644 --- a/src/test/ui/feature-gates/feature-gate-const_generics.stderr +++ b/src/test/ui/feature-gates/feature-gate-const_generics.stderr @@ -1,30 +1,21 @@ error[E0658]: const generics are unstable - --> $DIR/feature-gate-const_generics.rs:1:8 + --> $DIR/feature-gate-const_generics.rs:1:14 | LL | fn foo() {} - | ^^^^^^^^^^^ + | ^ | = note: for more information, see https://github.com/rust-lang/rust/issues/44580 = help: add `#![feature(const_generics)]` to the crate attributes to enable error[E0658]: const generics are unstable - --> $DIR/feature-gate-const_generics.rs:3:12 + --> $DIR/feature-gate-const_generics.rs:3:18 | LL | struct Foo([(); X]); - | ^^^^^^^^^^^^^^ + | ^ | = note: for more information, see https://github.com/rust-lang/rust/issues/44580 = help: add `#![feature(const_generics)]` to the crate attributes to enable -error[E0658]: const generics are unstable - --> $DIR/feature-gate-const_generics.rs:7:10 - | -LL | impl A {} - | ^^^^^^^^^^^ - | - = note: for more information, see https://github.com/rust-lang/rust/issues/44580 - = help: add `#![feature(const_generics)]` to the crate attributes to enable - -error: aborting due to 3 previous errors +error: aborting due to 2 previous errors For more information about this error, try `rustc --explain E0658`. -- cgit 1.4.1-3-g733a5