Skip to content

Commit

Permalink
Auto merge of rust-lang#80539 - JohnTitor:ui-test-root-cleanup, r=pet…
Browse files Browse the repository at this point in the history
…rochenkov

Reduce the entry on `src/test/ui` (UI test root)

CC rust-lang#73494, similar to rust-lang#79776.

r? `@petrochenkov`
  • Loading branch information
bors committed Jan 1, 2021
2 parents f8ab56b + 9fb9f29 commit e1fc9ff
Show file tree
Hide file tree
Showing 143 changed files with 20 additions and 28 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 5 additions & 9 deletions src/test/ui/array-slice-vec/array_const_index-1.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
// run-pass
#![allow(dead_code)]
#![allow(stable_features)]

#![feature(const_indexing)]
const A: [i32; 0] = [];
const B: i32 = A[1];
//~^ index out of bounds: the length is 0 but the index is 1
//~| ERROR any use of this value will cause an error

fn main() {
const ARR: [i32; 6] = [42, 43, 44, 45, 46, 47];
const IDX: usize = 3;
const VAL: i32 = ARR[IDX];
const BLUB: [i32; (ARR[0] - 41) as usize] = [5];
let _ = B;
}
File renamed without changes.
12 changes: 12 additions & 0 deletions src/test/ui/array-slice-vec/array_const_index-2.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// run-pass
#![allow(dead_code)]
#![allow(stable_features)]

#![feature(const_indexing)]

fn main() {
const ARR: [i32; 6] = [42, 43, 44, 45, 46, 47];
const IDX: usize = 3;
const VAL: i32 = ARR[IDX];
const BLUB: [i32; (ARR[0] - 41) as usize] = [5];
}
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.
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.
8 changes: 0 additions & 8 deletions src/test/ui/array_const_index-1.rs

This file was deleted.

8 changes: 0 additions & 8 deletions src/test/ui/auxiliary/trait_superkinds_in_metadata.rs

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.
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.
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.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
warning: unnecessary trailing semicolons
--> $DIR/block-expr-precedence.rs:60:21
--> $DIR/old-closure-expr-precedence.rs:60:21
|
LL | if (true) { 12; };;; -num;
| ^^ help: remove these semicolons
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/block-expression-remove-semicolon.rs:8:19
--> $DIR/old-closure-expression-remove-semicolon.rs:8:19
|
LL | let _x: i32 = {
| ___________________^
Expand Down
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.
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.
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.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/tools/tidy/src/ui_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 1580;
const ROOT_ENTRY_LIMIT: usize = 1500;
const ISSUES_ENTRY_LIMIT: usize = 2830;

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

0 comments on commit e1fc9ff

Please sign in to comment.