bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Update tests

Browse source
This commit is contained in:
Dylan MacKenzie 2020-01-13 20:30:34 -08:00
parent 0ac4ba0eed
commit 23ea42cfd1
13 changed files with 49 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.gated.stderr
View file

@ -1,8 +1,8 @@
error: `?const` on trait bounds is not yet implemented error: fatal error triggered by #[rustc_error]
--> $DIR/feature-gate.rs:11:29 --> $DIR/feature-gate.rs:16:1
| |
LL | const fn get_assoc_const<S: ?const T>() -> i32 { <S as T>::CONST } LL | fn main() {}
| ^^^^^^^^ | ^^^^^^^^^^^^
error: aborting due to previous error error: aborting due to previous error

5
src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.rs
View file

@ -3,6 +3,7 @@
#![cfg_attr(gated, feature(const_trait_bound_opt_out))] #![cfg_attr(gated, feature(const_trait_bound_opt_out))]
#![allow(incomplete_features)] #![allow(incomplete_features)]
#![feature(rustc_attrs)]
trait T { trait T {
const CONST: i32; const CONST: i32;
@ -10,6 +11,6 @@ trait T {
const fn get_assoc_const<S: ?const T>() -> i32 { <S as T>::CONST } const fn get_assoc_const<S: ?const T>() -> i32 { <S as T>::CONST }
//[stock]~^ ERROR `?const` on trait bounds is experimental //[stock]~^ ERROR `?const` on trait bounds is experimental
//[stock,gated]~^^ ERROR `?const` on trait bounds is not yet implemented
fn main() {} #[rustc_error]
fn main() {} //[gated]~ ERROR fatal error triggered by #[rustc_error]

10
src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.stock.stderr
View file

@ -1,5 +1,5 @@
error[E0658]: `?const` on trait bounds is experimental error[E0658]: `?const` on trait bounds is experimental
--> $DIR/feature-gate.rs:11:29 --> $DIR/feature-gate.rs:12:29
| |
LL | const fn get_assoc_const<S: ?const T>() -> i32 { <S as T>::CONST } LL | const fn get_assoc_const<S: ?const T>() -> i32 { <S as T>::CONST }
| ^^^^^^ | ^^^^^^
@ -7,12 +7,6 @@ LL | const fn get_assoc_const<S: ?const T>() -> i32 { <S as T>::CONST }
= note: for more information, see https://github.com/rust-lang/rust/issues/67794 = note: for more information, see https://github.com/rust-lang/rust/issues/67794
= help: add `#![feature(const_trait_bound_opt_out)]` to the crate attributes to enable = help: add `#![feature(const_trait_bound_opt_out)]` to the crate attributes to enable
error: `?const` on trait bounds is not yet implemented error: aborting due to previous error
--> $DIR/feature-gate.rs:11:29
|
LL | const fn get_assoc_const<S: ?const T>() -> i32 { <S as T>::CONST }
| ^^^^^^^^
error: aborting due to 2 previous errors
For more information about this error, try `rustc --explain E0658`. For more information about this error, try `rustc --explain E0658`.

4
src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-impl-trait.rs
View file

@ -8,18 +8,14 @@ impl T for S {}
fn rpit() -> impl ?const T { S } fn rpit() -> impl ?const T { S }
//~^ ERROR `?const` is not permitted in `impl Trait` //~^ ERROR `?const` is not permitted in `impl Trait`
//~| ERROR `?const` on trait bounds is not yet implemented
fn apit(_: impl ?const T) {} fn apit(_: impl ?const T) {}
//~^ ERROR `?const` is not permitted in `impl Trait` //~^ ERROR `?const` is not permitted in `impl Trait`
//~| ERROR `?const` on trait bounds is not yet implemented
fn rpit_assoc_bound() -> impl IntoIterator<Item: ?const T> { Some(S) } fn rpit_assoc_bound() -> impl IntoIterator<Item: ?const T> { Some(S) }
//~^ ERROR `?const` is not permitted in `impl Trait` //~^ ERROR `?const` is not permitted in `impl Trait`
//~| ERROR `?const` on trait bounds is not yet implemented
fn apit_assoc_bound(_: impl IntoIterator<Item: ?const T>) {} fn apit_assoc_bound(_: impl IntoIterator<Item: ?const T>) {}
//~^ ERROR `?const` is not permitted in `impl Trait` //~^ ERROR `?const` is not permitted in `impl Trait`
//~| ERROR `?const` on trait bounds is not yet implemented
fn main() {} fn main() {}

32
src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-impl-trait.stderr
View file

@ -5,46 +5,22 @@ LL | fn rpit() -> impl ?const T { S }
| ^^^^^^^^ | ^^^^^^^^
error: `?const` is not permitted in `impl Trait` error: `?const` is not permitted in `impl Trait`
--> $DIR/in-impl-trait.rs:13:17 --> $DIR/in-impl-trait.rs:12:17
| |
LL | fn apit(_: impl ?const T) {} LL | fn apit(_: impl ?const T) {}
| ^^^^^^^^ | ^^^^^^^^
error: `?const` is not permitted in `impl Trait` error: `?const` is not permitted in `impl Trait`
--> $DIR/in-impl-trait.rs:17:50 --> $DIR/in-impl-trait.rs:15:50
| |
LL | fn rpit_assoc_bound() -> impl IntoIterator<Item: ?const T> { Some(S) } LL | fn rpit_assoc_bound() -> impl IntoIterator<Item: ?const T> { Some(S) }
| ^^^^^^^^ | ^^^^^^^^
error: `?const` is not permitted in `impl Trait` error: `?const` is not permitted in `impl Trait`
--> $DIR/in-impl-trait.rs:21:48 --> $DIR/in-impl-trait.rs:18:48
| |
LL | fn apit_assoc_bound(_: impl IntoIterator<Item: ?const T>) {} LL | fn apit_assoc_bound(_: impl IntoIterator<Item: ?const T>) {}
| ^^^^^^^^ | ^^^^^^^^
error: `?const` on trait bounds is not yet implemented error: aborting due to 4 previous errors
--> $DIR/in-impl-trait.rs:9:19
|
LL | fn rpit() -> impl ?const T { S }
| ^^^^^^^^
error: `?const` on trait bounds is not yet implemented
--> $DIR/in-impl-trait.rs:13:17
|
LL | fn apit(_: impl ?const T) {}
| ^^^^^^^^
error: `?const` on trait bounds is not yet implemented
--> $DIR/in-impl-trait.rs:17:50
|
LL | fn rpit_assoc_bound() -> impl IntoIterator<Item: ?const T> { Some(S) }
| ^^^^^^^^
error: `?const` on trait bounds is not yet implemented
--> $DIR/in-impl-trait.rs:21:48
|
LL | fn apit_assoc_bound(_: impl IntoIterator<Item: ?const T>) {}
| ^^^^^^^^
error: aborting due to 8 previous errors

1
src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-bounds.rs
View file

@ -4,6 +4,5 @@
trait Super {} trait Super {}
trait T: ?const Super {} trait T: ?const Super {}
//~^ ERROR `?const` is not permitted in supertraits //~^ ERROR `?const` is not permitted in supertraits
//~| ERROR `?const` on trait bounds is not yet implemented
fn main() {} fn main() {}

8
src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-bounds.stderr
View file

@ -4,11 +4,5 @@ error: `?const` is not permitted in supertraits
LL | trait T: ?const Super {} LL | trait T: ?const Super {}
| ^^^^^^^^^^^^ | ^^^^^^^^^^^^
error: `?const` on trait bounds is not yet implemented error: aborting due to previous error
--> $DIR/in-trait-bounds.rs:5:10
|
LL | trait T: ?const Super {}
| ^^^^^^^^^^^^
error: aborting due to 2 previous errors

3
src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-object.rs
View file

@ -9,14 +9,11 @@ impl T for S {}
// An inherent impl for the trait object `?const T`. // An inherent impl for the trait object `?const T`.
impl ?const T {} impl ?const T {}
//~^ ERROR `?const` is not permitted in trait objects //~^ ERROR `?const` is not permitted in trait objects
//~| ERROR `?const` on trait bounds is not yet implemented
fn trait_object() -> &'static dyn ?const T { &S } fn trait_object() -> &'static dyn ?const T { &S }
//~^ ERROR `?const` is not permitted in trait objects //~^ ERROR `?const` is not permitted in trait objects
//~| ERROR `?const` on trait bounds is not yet implemented
fn trait_object_in_apit(_: impl IntoIterator<Item = Box<dyn ?const T>>) {} fn trait_object_in_apit(_: impl IntoIterator<Item = Box<dyn ?const T>>) {}
//~^ ERROR `?const` is not permitted in trait objects //~^ ERROR `?const` is not permitted in trait objects
//~| ERROR `?const` on trait bounds is not yet implemented
fn main() {} fn main() {}

24
src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-object.stderr
View file

@ -5,34 +5,16 @@ LL | impl ?const T {}
| ^^^^^^^^ | ^^^^^^^^
error: `?const` is not permitted in trait objects error: `?const` is not permitted in trait objects
--> $DIR/in-trait-object.rs:14:35 --> $DIR/in-trait-object.rs:13:35
| |
LL | fn trait_object() -> &'static dyn ?const T { &S } LL | fn trait_object() -> &'static dyn ?const T { &S }
| ^^^^^^^^ | ^^^^^^^^
error: `?const` is not permitted in trait objects error: `?const` is not permitted in trait objects
--> $DIR/in-trait-object.rs:18:61 --> $DIR/in-trait-object.rs:16:61
| |
LL | fn trait_object_in_apit(_: impl IntoIterator<Item = Box<dyn ?const T>>) {} LL | fn trait_object_in_apit(_: impl IntoIterator<Item = Box<dyn ?const T>>) {}
| ^^^^^^^^ | ^^^^^^^^
error: `?const` on trait bounds is not yet implemented error: aborting due to 3 previous errors
--> $DIR/in-trait-object.rs:10:6
|
LL | impl ?const T {}
| ^^^^^^^^
error: `?const` on trait bounds is not yet implemented
--> $DIR/in-trait-object.rs:14:35
|
LL | fn trait_object() -> &'static dyn ?const T { &S }
| ^^^^^^^^
error: `?const` on trait bounds is not yet implemented
--> $DIR/in-trait-object.rs:18:61
|
LL | fn trait_object_in_apit(_: impl IntoIterator<Item = Box<dyn ?const T>>) {}
| ^^^^^^^^
error: aborting due to 6 previous errors

1
src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/with-maybe-sized.rs
View file

@ -3,6 +3,5 @@
struct S<T: ?const ?Sized>(std::marker::PhantomData<T>); struct S<T: ?const ?Sized>(std::marker::PhantomData<T>);
//~^ ERROR `?const` and `?` are mutually exclusive //~^ ERROR `?const` and `?` are mutually exclusive
//~| ERROR `?const` on trait bounds is not yet implemented
fn main() {} fn main() {}

8
src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/with-maybe-sized.stderr
View file

@ -4,11 +4,5 @@ error: `?const` and `?` are mutually exclusive
LL | struct S<T: ?const ?Sized>(std::marker::PhantomData<T>); LL | struct S<T: ?const ?Sized>(std::marker::PhantomData<T>);
| ^^^^^^^^^^^^^ | ^^^^^^^^^^^^^
error: `?const` on trait bounds is not yet implemented error: aborting due to previous error
--> $DIR/with-maybe-sized.rs:4:13
|
LL | struct S<T: ?const ?Sized>(std::marker::PhantomData<T>);
| ^^^^^^^^^^^^^
error: aborting due to 2 previous errors

9
src/test/ui/rfc-2632-const-trait-impl/inherent-impl.rs
View file

@ -1,5 +1,3 @@
// compile-flags: -Z parse-only
#![feature(const_trait_impl)] #![feature(const_trait_impl)]
#![feature(const_trait_bound_opt_out)] #![feature(const_trait_bound_opt_out)]
#![allow(incomplete_features)] #![allow(incomplete_features)]
@ -8,7 +6,12 @@
struct S; struct S;
trait T {} trait T {}
impl const S {}
//~^ ERROR inherent impls cannot be `const`
//~| ERROR const trait impls are not yet implemented
impl const T {} impl const T {}
//~^ ERROR `const` cannot modify an inherent impl //~^ ERROR inherent impls cannot be `const`
//~| ERROR const trait impls are not yet implemented
fn main() {} fn main() {}

30
src/test/ui/rfc-2632-const-trait-impl/inherent-impl.stderr
View file

@ -1,10 +1,30 @@
error: `const` cannot modify an inherent impl error: inherent impls cannot be `const`
--> $DIR/inherent-impl.rs:11:6 --> $DIR/inherent-impl.rs:9:1
|
LL | impl const S {}
| ^^^^^^^^^^^^^^^
|
= note: only trait implementations may be annotated with `const`
error: inherent impls cannot be `const`
--> $DIR/inherent-impl.rs:13:1
| |
LL | impl const T {} LL | impl const T {}
| ^^^^^ | ^^^^^^^^^^^^^^^
| |
= help: only a trait impl can be `const` = note: only trait implementations may be annotated with `const`
error: aborting due to previous error error: const trait impls are not yet implemented
--> $DIR/inherent-impl.rs:9:1
|
LL | impl const S {}
| ^^^^^^^^^^^^^^^
error: const trait impls are not yet implemented
--> $DIR/inherent-impl.rs:13:1
|
LL | impl const T {}
| ^^^^^^^^^^^^^^^
error: aborting due to 4 previous errors