Skip to content

Commit 9da8a5b

Browse files
lcnrlcnr
committed
update tests
1 parent 6a72ba4 commit 9da8a5b

12 files changed

+11
-21
lines changed

‎src/test/ui/const-generics/array-size-in-generic-struct-param.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
<<<<<<< HEAD
2-
//~^ WARN the feature `const_generics` is incomplete
3-
#![feature(lazy_normalization_consts)]
4-
//~^ WARN the feature `lazy_normalization_consts` is incomplete
5-
=======
61
#![feature(const_generics)]
7-
//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
8-
>>>>>>> merge lazy_normalization_consts into const_generics
2+
//~^ WARN the feature `const_generics` is incomplete
93

104
#[allow(dead_code)]
115
struct ArithArrayLen<const N: usize>([u32; 0 + N]);

‎src/test/ui/const-generics/issues/issue-61336-1.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(lazy_normalization_consts)]
2-
//~^ WARN the feature `lazy_normalization_consts` is incomplete
31
#![feature(const_generics)]
42
//~^ WARN the feature `const_generics` is incomplete
53

‎src/test/ui/const-generics/issues/issue-61336-1.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
warning: the feature `const_generics` is incomplete and may cause the compiler to crash
1+
warning: the feature `const_generics` is incomplete and may not be safe to use and/or cause compiler crashes
22
--> $DIR/issue-61336-1.rs:1:12
33
|
44
LL | #![feature(const_generics)]
55
| ^^^^^^^^^^^^^^
66
|
77
= note: `#[warn(incomplete_features)]` on by default
8+
= note: see issue #44580 <https://github.com/rust-lang/rust/issues/44580> for more information
89

910
warning: 1 warning emitted
1011

‎src/test/ui/const-generics/issues/issue-61336-2.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(lazy_normalization_consts)]
2-
//~^ WARN the feature `lazy_normalization_consts` is incomplete
31
#![feature(const_generics)]
42
//~^ WARN the feature `const_generics` is incomplete
53

‎src/test/ui/const-generics/issues/issue-61336.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#![feature(const_generics)]
22
//~^ WARN the feature `const_generics` is incomplete
3-
#![feature(lazy_normalization_consts)]
4-
//~^ WARN the feature `lazy_normalization_consts` is incomplete
53

64
fn f<T: Copy, const N: usize>(x: T) -> [T; N] {
75
[x; N]

‎src/test/ui/const-generics/issues/issue-61747.rs

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
#![feature(const_generics)]
44
//~^ WARN the feature `const_generics` is incomplete
5-
#![feature(lazy_normalization_consts)]
6-
//~^ WARN the feature `lazy_normalization_consts` is incomplete
75

86
struct Const<const N: usize>;
97

‎src/test/ui/const-generics/issues/issue-61935.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// check-pass
22

33
#![feature(const_generics)]
4-
//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
4+
//~^ WARN the feature `const_generics` is incomplete
55

66
trait Foo {}
77

‎src/test/ui/const-generics/issues/issue-61935.stderr

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
warning: the feature `const_generics` is incomplete and may not be safe to use and/or cause compiler crashes
2+
--> $DIR/issue-61935.rs:3:12
23
|
34
LL | #![feature(const_generics)]
45
| ^^^^^^^^^^^^^^

‎src/test/ui/const-generics/issues/issue-67185-1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// check-pass
22

33
#![feature(const_generics)]
4-
//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
4+
//~^ WARN the feature `const_generics` is incomplete
55

66
trait Baz {
77
type Quaks;

‎src/test/ui/const-generics/issues/issue-67185-1.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
warning: the feature `const_generics` is incomplete and may cause the compiler to crash
1+
warning: the feature `const_generics` is incomplete and may not be safe to use and/or cause compiler crashes
22
--> $DIR/issue-67185-1.rs:3:12
33
|
44
LL | #![feature(const_generics)]
55
| ^^^^^^^^^^^^^^
66
|
77
= note: `#[warn(incomplete_features)]` on by default
8+
= note: see issue #44580 <https://github.com/rust-lang/rust/issues/44580> for more information
89

910
warning: 1 warning emitted
1011

‎src/test/ui/const-generics/issues/issue-67185-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(const_generics)]
2-
//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
2+
//~^ WARN the feature `const_generics` is incomplete
33

44
trait Baz {
55
type Quaks;

‎src/test/ui/const-generics/issues/issue-67185-2.stderr

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
warning: the feature `const_generics` is incomplete and may cause the compiler to crash
1+
warning: the feature `const_generics` is incomplete and may not be safe to use and/or cause compiler crashes
22
--> $DIR/issue-67185-2.rs:1:12
33
|
44
LL | #![feature(const_generics)]
55
| ^^^^^^^^^^^^^^
66
|
77
= note: `#[warn(incomplete_features)]` on by default
8+
= note: see issue #44580 <https://github.com/rust-lang/rust/issues/44580> for more information
89

910
error[E0277]: the trait bound `[u16; 3]: Bar` is not satisfied
1011
--> $DIR/issue-67185-2.rs:15:1

0 commit comments

Comments
 (0)