Skip to content

Commit

Permalink
Rollup merge of #110379 - ehuss:unignore-tests, r=compiler-errors
Browse files Browse the repository at this point in the history
Update some ignored tests.

This unignores some tests which no longer need to be ignored (see individual commits for reasons why). This also adds some descriptions to why tests are ignored so they can be seen in the test output.
  • Loading branch information
fee1-dead authored Apr 16, 2023
2 parents ff39942 + a4e851c commit 4d868c9
Show file tree
Hide file tree
Showing 24 changed files with 39 additions and 30 deletions.
3 changes: 1 addition & 2 deletions tests/mir-opt/simplify_arm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
// EMIT_MIR simplify_arm.id_try.SimplifyArmIdentity.diff
// EMIT_MIR simplify_arm.id_try.SimplifyBranchSame.diff

// This pass is broken since deaggregation changed
// ignore-test
// ignore-test This pass is broken since deaggregation changed

fn id(o: Option<u8>) -> Option<u8> {
match o {
Expand Down
3 changes: 1 addition & 2 deletions tests/mir-opt/simplify_arm_identity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
// compile-flags: -Zmir-opt-level=3
// EMIT_MIR_FOR_EACH_BIT_WIDTH

// This pass is broken since deaggregation changed
// ignore-test
// ignore-test This pass is broken since deaggregation changed

enum Src {
Foo(u8),
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/borrowck/move-error-snippets-ext.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-test
// ignore-test (auxiliary, used by other tests)

macro_rules! aaa {
($c:ident) => {{
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/codemap_tests/two_files_data.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-test
// ignore-test (auxiliary, used by other tests)

trait Foo { }

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/conditional-compilation/module_with_cfg.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// ignore-test
// ignore-test (auxiliary, used by other tests)

#![cfg_attr(all(), cfg(FALSE))]
2 changes: 1 addition & 1 deletion tests/ui/cross/cross-file-errors/main.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: in expressions, `_` can only be used on the left-hand side of an assignment
--> $DIR/underscore.rs:8:9
--> $DIR/underscore.rs:6:9
|
LL | _
| ^ `_` not allowed here
Expand Down
4 changes: 1 addition & 3 deletions tests/ui/cross/cross-file-errors/underscore.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
// We want this file only so we can test cross-file error
// messages, but we don't want it in an external crate.
// ignore-test
// ignore-test (auxiliary, used by other tests)
#![crate_type = "lib"]

macro_rules! underscore {
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/inline-const/const-match-pat-lifetime-err.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-test
// ignore-test (This is currently broken)

#![allow(incomplete_features)]
#![feature(const_mut_refs)]
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/issues/issue-49298.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// where #54986 is implemented and #54987 is *not* implemented. For
// now: just ignore it
//
// ignore-test
// ignore-test (#54987)

// This test is checking that the space allocated for `x.1` does not
// overlap with `y`. (The reason why such a thing happened at one
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/issues/issue-59756.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// run-rustfix
// ignore-test
// ignore-test (rustfix needs multiple suggestions)
//
// FIXME: Re-enable this test once we support choosing
// between multiple mutually exclusive suggestions for the same span
Expand Down
4 changes: 1 addition & 3 deletions tests/ui/lint/dead-code/closure-bang.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// ignore-test FIXME(#20574)

#![deny(unreachable_code)]

fn main() {
let x = || panic!();
let x = || -> ! { panic!() };
x();
println!("Foo bar"); //~ ERROR: unreachable statement
}
17 changes: 17 additions & 0 deletions tests/ui/lint/dead-code/closure-bang.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
error: unreachable statement
--> $DIR/closure-bang.rs:6:5
|
LL | x();
| --- any code following this expression is unreachable
LL | println!("Foo bar");
| ^^^^^^^^^^^^^^^^^^^ unreachable statement
|
note: the lint level is defined here
--> $DIR/closure-bang.rs:1:9
|
LL | #![deny(unreachable_code)]
| ^^^^^^^^^^^^^^^^
= note: this error originates in the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)

error: aborting due to previous error

2 changes: 1 addition & 1 deletion tests/ui/macros/macro-expanded-include/foo/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-test
// ignore-test (auxiliary, used by other tests)

macro_rules! m {
() => { include!("file.txt"); }
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/match/issue-26996.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// where #54986 is implemented and #54987 is *not* implemented. For
// now: just ignore it
//
// ignore-test
// ignore-test (#54987)

// This test is checking that the write to `c.0` (which has been moved out of)
// won't overwrite the state in `c2`.
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/match/issue-27021.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// where #54986 is implemented and #54987 is *not* implemented. For
// now: just ignore it
//
// ignore-test
// ignore-test (#54987)

// These are variants of issue-26996.rs. In all cases we are writing
// into a record field that has been moved out of, and ensuring that
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/numbers-arithmetic/saturating-float-casts-impl.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-test
// ignore-test (auxiliary, used by other tests)

// Tests saturating float->int casts. See u128-as-f32.rs for the opposite direction.
//
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/panics/panic-short-backtrace-windows-x86_64.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// This test has been spuriously failing a lot recently (#92000).
// Ignore it until the underlying issue is fixed.
// ignore-test
// ignore-test (#92000)

// Regression test for #87481: short backtrace formatting cut off the entire stack trace.

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/proc-macro/module.rs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
// ignore-test
// ignore-test (auxiliary, used by other tests)
2 changes: 1 addition & 1 deletion tests/ui/proc-macro/module_with_attrs.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-test
// ignore-test (auxiliary, used by other tests)

#![rustfmt::skip]
#![print_attr]
2 changes: 1 addition & 1 deletion tests/ui/proc-macro/outer/inner.rs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
// ignore-test
// ignore-test (auxiliary, used by other tests)
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-test
// ignore-test (auxiliary, used by other tests)

#[derive(Print)]
enum ProceduralMasqueradeDummyType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-test
// ignore-test (auxiliary, used by other tests)

#[derive(Print)]
enum ProceduralMasqueradeDummyType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-test
// ignore-test (auxiliary, used by other tests)

#[derive(Print)]
enum ProceduralMasqueradeDummyType {
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/type-alias-impl-trait/issue-65918.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// ignore-test: This now ICEs again.

// build-pass

#![feature(type_alias_impl_trait)]
Expand Down

0 comments on commit 4d868c9

Please sign in to comment.