Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit db9b8ce

Browse files
committed
update tests
1 parent 69d2d73 commit db9b8ce

File tree

69 files changed

+48
-215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+48
-215
lines changed

src/test/incremental/const-generics/hash-tyvid-regression-2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// revisions: cfail
2-
#![feature(generic_const_exprs, adt_const_params, const_generics_defaults)]
2+
#![feature(generic_const_exprs, adt_const_params)]
33
#![allow(incomplete_features)]
44
// regression test for #77650
55
struct C<T, const N: core::num::NonZeroUsize>([T; N.get()])

src/test/rustdoc/const-generics/const-generic-defaults.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#![crate_name = "foo"]
2-
#![feature(const_generics_defaults)]
32

43
// @has foo/struct.Foo.html '//pre[@class="rust struct"]' \
54
// 'pub struct Foo<const M: usize = 10_usize, const N: usize = M, T = i32>(_);'

src/test/ui/const-generics/argument_order.min.stderr

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/test/ui/const-generics/argument_order.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
// revisions: full min
2-
#![cfg_attr(full, feature(const_generics_defaults))]
3-
41
struct Bad<const N: usize, T> {
5-
//[min]~^ ERROR type parameters must be declared prior to const parameters
62
arr: [u8; { N }],
73
another: T,
84
}
95

106
struct AlsoBad<const N: usize, 'a, T, 'b, const M: usize, U> {
117
//~^ ERROR lifetime parameters must be declared prior
12-
//[min]~^^ ERROR type parameters must be declared prior to const parameters
138
a: &'a T,
149
b: &'b U,
1510
}

src/test/ui/const-generics/argument_order.full.stderr renamed to src/test/ui/const-generics/argument_order.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: lifetime parameters must be declared prior to const parameters
2-
--> $DIR/argument_order.rs:10:32
2+
--> $DIR/argument_order.rs:6:32
33
|
44
LL | struct AlsoBad<const N: usize, 'a, T, 'b, const M: usize, U> {
55
| -----------------^^-----^^-------------------- help: reorder the parameters: lifetimes, then consts and types: `<'a, 'b, const N: usize, T, const M: usize, U>`
66

77
error[E0747]: lifetime provided when a type was expected
8-
--> $DIR/argument_order.rs:18:23
8+
--> $DIR/argument_order.rs:13:23
99
|
1010
LL | let _: AlsoBad<7, 'static, u32, 'static, 17, u16>;
1111
| ^^^^^^^

src/test/ui/const-generics/const-arg-type-arg-misordered.stderr

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ error[E0747]: constant provided when a type was expected
33
|
44
LL | fn foo<const N: usize>() -> Array<N, ()> {
55
| ^
6-
|
7-
= note: type arguments must be provided before constant arguments
8-
= help: reorder the arguments: types, then consts: `<T, N>`
96

107
error: aborting due to previous error
118

src/test/ui/const-generics/const-param-before-other-params.min.stderr

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
// revisions: full min
2-
#![cfg_attr(full, feature(const_generics_defaults))]
3-
#![cfg_attr(full, allow(incomplete_features))]
4-
51
fn bar<const X: u8, 'a>(_: &'a ()) {
62
//~^ ERROR lifetime parameters must be declared prior to const parameters
73
}
84

95
fn foo<const X: u8, T>(_: &T) {}
10-
//[min]~^ ERROR type parameters must be declared prior to const parameters
116

127
fn main() {}

src/test/ui/const-generics/const-param-before-other-params.full.stderr renamed to src/test/ui/const-generics/const-param-before-other-params.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: lifetime parameters must be declared prior to const parameters
2-
--> $DIR/const-param-before-other-params.rs:5:21
2+
--> $DIR/const-param-before-other-params.rs:1:21
33
|
44
LL | fn bar<const X: u8, 'a>(_: &'a ()) {
55
| --------------^^- help: reorder the parameters: lifetimes, then consts and types: `<'a, const X: u8>`

src/test/ui/const-generics/defaults/auxiliary/const_defaulty.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(const_generics_defaults)]
2-
31
pub struct Defaulted<const N: usize=3>;
42
impl Defaulted {
53
pub fn new() -> Self {

0 commit comments

Comments
 (0)