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

Move some tests from `src/test/ui` to more reasonable places
rust-lang · Nov 4, 2022 · e6eaa2f · e6eaa2f
2 parents 61c6cdb + 35b16d0
commit e6eaa2f
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 8 deletions.
diff --git a/src/test/ui/attr-from-macro.rs → src/test/ui/macros/attr-from-macro.rs b/src/test/ui/attr-from-macro.rs → src/test/ui/macros/attr-from-macro.rs
diff --git a/src/test/ui/auxiliary/attr-from-macro.rs → ...st/ui/macros/auxiliary/attr-from-macro.rs b/src/test/ui/auxiliary/attr-from-macro.rs → ...st/ui/macros/auxiliary/attr-from-macro.rs
diff --git a/src/test/ui/align-with-extern-c-fn.rs → src/test/ui/repr/align-with-extern-c-fn.rs b/src/test/ui/align-with-extern-c-fn.rs → src/test/ui/repr/align-with-extern-c-fn.rs
diff --git a/src/test/ui/aligned_enum_cast.rs → src/test/ui/repr/aligned_enum_cast.rs b/src/test/ui/aligned_enum_cast.rs → src/test/ui/repr/aligned_enum_cast.rs
diff --git a/src/test/ui/repr_c_int_align.rs → src/test/ui/repr/repr_c_int_align.rs b/src/test/ui/repr_c_int_align.rs → src/test/ui/repr/repr_c_int_align.rs
diff --git a/src/test/ui/rfc1623.rs → src/test/ui/rfcs/rfc1623-2.rs b/src/test/ui/rfc1623.rs → src/test/ui/rfcs/rfc1623-2.rs
diff --git a/src/test/ui/rfc1623.stderr → src/test/ui/rfcs/rfc1623-2.stderr b/src/test/ui/rfc1623.stderr → src/test/ui/rfcs/rfc1623-2.stderr
@@ -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

diff --git a/src/test/ui/rfc1623-2.rs → src/test/ui/rfcs/rfc1623-3.rs b/src/test/ui/rfc1623-2.rs → src/test/ui/rfcs/rfc1623-3.rs
diff --git a/src/test/ui/rfc1623-2.stderr → src/test/ui/rfcs/rfc1623-3.stderr b/src/test/ui/rfc1623-2.stderr → src/test/ui/rfcs/rfc1623-3.stderr
@@ -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

diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
@@ -7,7 +7,7 @@ use std::path::Path;
 
 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) {