mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #103930 - fee1-dead-contrib:mv-from-root, r=jyn514

Browse Source 
Move some tests from `src/test/ui` to more reasonable places
This commit is contained in:
Matthias Krüger 2022-11-04 06:40:33 +01:00 committed by GitHub
commit e6eaa2fe69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/test/ui/attr-from-macro.rs → src/test/ui/macros/attr-from-macro.rs
View File

0
src/test/ui/auxiliary/attr-from-macro.rs → src/test/ui/macros/auxiliary/attr-from-macro.rs
View File

0
src/test/ui/align-with-extern-c-fn.rs → src/test/ui/repr/align-with-extern-c-fn.rs
View File

0
src/test/ui/aligned_enum_cast.rs → src/test/ui/repr/aligned_enum_cast.rs
View File

0
src/test/ui/repr_c_int_align.rs → src/test/ui/repr/repr_c_int_align.rs
View File

0
src/test/ui/rfc1623.rs → src/test/ui/rfcs/rfc1623-2.rs
View File

8
src/test/ui/rfc1623.stderr → src/test/ui/rfcs/rfc1623-2.stderr
View File

@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/rfc1623.rs:28:8
--> $DIR/rfc1623-2.rs:28:8
|
LL | f: &id,
| ^^^ one type is more general than the other
@ -8,7 +8,7 @@ LL | f: &id,
found trait `Fn<(&Foo<'_>,)>`
error[E0308]: mismatched types
--> $DIR/rfc1623.rs:28:8
--> $DIR/rfc1623-2.rs:28:8
|
LL | f: &id,
| ^^^ one type is more general than the other
@ -17,7 +17,7 @@ LL | f: &id,
found trait `Fn<(&Foo<'_>,)>`
error: implementation of `FnOnce` is not general enough
--> $DIR/rfc1623.rs:28:8
--> $DIR/rfc1623-2.rs:28:8
|
LL | f: &id,
| ^^^ implementation of `FnOnce` is not general enough
@ -26,7 +26,7 @@ LL | f: &id,
= note: ...but it actually implements `FnOnce<(&'2 Foo<'_>,)>`, for some specific lifetime `'2`
error: implementation of `FnOnce` is not general enough
--> $DIR/rfc1623.rs:28:8
--> $DIR/rfc1623-2.rs:28:8
|
LL | f: &id,
| ^^^ implementation of `FnOnce` is not general enough

0
src/test/ui/rfc1623-2.rs → src/test/ui/rfcs/rfc1623-3.rs
View File

6
src/test/ui/rfc1623-2.stderr → src/test/ui/rfcs/rfc1623-3.stderr
View File

@ -1,5 +1,5 @@
error[E0106]: missing lifetime specifier
--> $DIR/rfc1623-2.rs:8:42
--> $DIR/rfc1623-3.rs:8:42
|
LL | static NON_ELIDABLE_FN: &fn(&u8, &u8) -> &u8 =
| --- --- ^ expected named lifetime parameter
@ -12,7 +12,7 @@ LL | static NON_ELIDABLE_FN: &for<'a> fn(&'a u8, &'a u8) -> &'a u8 =
| +++++++ ++ ++ ++
error[E0106]: missing lifetime specifier
--> $DIR/rfc1623-2.rs:10:39
--> $DIR/rfc1623-3.rs:10:39
|
LL | &(non_elidable as fn(&u8, &u8) -> &u8);
| --- --- ^ expected named lifetime parameter
@ -24,7 +24,7 @@ LL | &(non_elidable as for<'a> fn(&'a u8, &'a u8) -> &'a u8);
| +++++++ ++ ++ ++
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`
--> $DIR/rfc1623-2.rs:10:6
--> $DIR/rfc1623-3.rs:10:6
|
LL | &(non_elidable as fn(&u8, &u8) -> &u8);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid cast

2
src/tools/tidy/src/ui_tests.rs
View File

@ -7,7 +7,7 @@
const ENTRY_LIMIT: usize = 1000;
// FIXME: The following limits should be reduced eventually.
const ROOT_ENTRY_LIMIT: usize = 948;
const ROOT_ENTRY_LIMIT: usize = 941;
const ISSUES_ENTRY_LIMIT: usize = 2117;
fn check_entries(path: &Path, bad: &mut bool) {