Skip to content

Commit e6eaa2f

Browse files
authored
Rollup merge of #103930 - fee1-dead-contrib:mv-from-root, r=jyn514
Move some tests from `src/test/ui` to more reasonable places
2 parents 61c6cdb + 35b16d0 commit e6eaa2f

10 files changed

+8
-8
lines changed
File renamed without changes.

src/test/ui/rfc1623.stderr renamed to src/test/ui/rfcs/rfc1623-2.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0308]: mismatched types
2-
--> $DIR/rfc1623.rs:28:8
2+
--> $DIR/rfc1623-2.rs:28:8
33
|
44
LL | f: &id,
55
| ^^^ one type is more general than the other
@@ -8,7 +8,7 @@ LL | f: &id,
88
found trait `Fn<(&Foo<'_>,)>`
99

1010
error[E0308]: mismatched types
11-
--> $DIR/rfc1623.rs:28:8
11+
--> $DIR/rfc1623-2.rs:28:8
1212
|
1313
LL | f: &id,
1414
| ^^^ one type is more general than the other
@@ -17,7 +17,7 @@ LL | f: &id,
1717
found trait `Fn<(&Foo<'_>,)>`
1818

1919
error: implementation of `FnOnce` is not general enough
20-
--> $DIR/rfc1623.rs:28:8
20+
--> $DIR/rfc1623-2.rs:28:8
2121
|
2222
LL | f: &id,
2323
| ^^^ implementation of `FnOnce` is not general enough
@@ -26,7 +26,7 @@ LL | f: &id,
2626
= note: ...but it actually implements `FnOnce<(&'2 Foo<'_>,)>`, for some specific lifetime `'2`
2727

2828
error: implementation of `FnOnce` is not general enough
29-
--> $DIR/rfc1623.rs:28:8
29+
--> $DIR/rfc1623-2.rs:28:8
3030
|
3131
LL | f: &id,
3232
| ^^^ implementation of `FnOnce` is not general enough
File renamed without changes.

src/test/ui/rfc1623-2.stderr renamed to src/test/ui/rfcs/rfc1623-3.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0106]: missing lifetime specifier
2-
--> $DIR/rfc1623-2.rs:8:42
2+
--> $DIR/rfc1623-3.rs:8:42
33
|
44
LL | static NON_ELIDABLE_FN: &fn(&u8, &u8) -> &u8 =
55
| --- --- ^ expected named lifetime parameter
@@ -12,7 +12,7 @@ LL | static NON_ELIDABLE_FN: &for<'a> fn(&'a u8, &'a u8) -> &'a u8 =
1212
| +++++++ ++ ++ ++
1313

1414
error[E0106]: missing lifetime specifier
15-
--> $DIR/rfc1623-2.rs:10:39
15+
--> $DIR/rfc1623-3.rs:10:39
1616
|
1717
LL | &(non_elidable as fn(&u8, &u8) -> &u8);
1818
| --- --- ^ expected named lifetime parameter
@@ -24,7 +24,7 @@ LL | &(non_elidable as for<'a> fn(&'a u8, &'a u8) -> &'a u8);
2424
| +++++++ ++ ++ ++
2525

2626
error[E0605]: non-primitive cast: `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8 {non_elidable}` as `for<'a, 'b> fn(&'a u8, &'b u8) -> &u8`
27-
--> $DIR/rfc1623-2.rs:10:6
27+
--> $DIR/rfc1623-3.rs:10:6
2828
|
2929
LL | &(non_elidable as fn(&u8, &u8) -> &u8);
3030
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid cast

src/tools/tidy/src/ui_tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::path::Path;
77

88
const ENTRY_LIMIT: usize = 1000;
99
// FIXME: The following limits should be reduced eventually.
10-
const ROOT_ENTRY_LIMIT: usize = 948;
10+
const ROOT_ENTRY_LIMIT: usize = 941;
1111
const ISSUES_ENTRY_LIMIT: usize = 2117;
1212

1313
fn check_entries(path: &Path, bad: &mut bool) {

0 commit comments

Comments
 (0)