Skip to content

Commit e1fc9ff

Browse files
committed
Auto merge of #80539 - JohnTitor:ui-test-root-cleanup, r=petrochenkov
Reduce the entry on `src/test/ui` (UI test root) CC #73494, similar to #79776. r? `@petrochenkov`
2 parents f8ab56b + 9fb9f29 commit e1fc9ff

File tree

143 files changed

+20
-28
lines changed

Some content is hidden

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

143 files changed

+20
-28
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
// run-pass
2-
#![allow(dead_code)]
3-
#![allow(stable_features)]
4-
5-
#![feature(const_indexing)]
1+
const A: [i32; 0] = [];
2+
const B: i32 = A[1];
3+
//~^ index out of bounds: the length is 0 but the index is 1
4+
//~| ERROR any use of this value will cause an error
65

76
fn main() {
8-
const ARR: [i32; 6] = [42, 43, 44, 45, 46, 47];
9-
const IDX: usize = 3;
10-
const VAL: i32 = ARR[IDX];
11-
const BLUB: [i32; (ARR[0] - 41) as usize] = [5];
7+
let _ = B;
128
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// run-pass
2+
#![allow(dead_code)]
3+
#![allow(stable_features)]
4+
5+
#![feature(const_indexing)]
6+
7+
fn main() {
8+
const ARR: [i32; 6] = [42, 43, 44, 45, 46, 47];
9+
const IDX: usize = 3;
10+
const VAL: i32 = ARR[IDX];
11+
const BLUB: [i32; (ARR[0] - 41) as usize] = [5];
12+
}
File renamed without changes.
File renamed without changes.

src/test/ui/array_const_index-1.rs

-8
This file was deleted.

src/test/ui/auxiliary/trait_superkinds_in_metadata.rs

-8
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/test/ui/block-expr-precedence.stderr renamed to src/test/ui/closures/old-closure-expr-precedence.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: unnecessary trailing semicolons
2-
--> $DIR/block-expr-precedence.rs:60:21
2+
--> $DIR/old-closure-expr-precedence.rs:60:21
33
|
44
LL | if (true) { 12; };;; -num;
55
| ^^ help: remove these semicolons

src/test/ui/block-expression-remove-semicolon.stderr renamed to src/test/ui/closures/old-closure-expression-remove-semicolon.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0308]: mismatched types
2-
--> $DIR/block-expression-remove-semicolon.rs:8:19
2+
--> $DIR/old-closure-expression-remove-semicolon.rs:8:19
33
|
44
LL | let _x: i32 = {
55
| ___________________^
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

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 = 1580;
10+
const ROOT_ENTRY_LIMIT: usize = 1500;
1111
const ISSUES_ENTRY_LIMIT: usize = 2830;
1212

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

0 commit comments

Comments
 (0)