Skip to content

Commit

Permalink
Rollup merge of rust-lang#62369 - JohnTitor:remove-compile-pass, r=pe…
Browse files Browse the repository at this point in the history
…trochenkov

Remove `compile-pass` from compiletest

This is a part of rust-lang#62277.
Removes `compile-pass` from compiletest (and modify some tests' annotations).

r? @Centril
  • Loading branch information
Centril authored Jul 5, 2019
2 parents 30aa245 + 1640ab2 commit 216a187
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/doc/rustc-guide
4 changes: 2 additions & 2 deletions src/librustc_mir/error_codes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ An if-let pattern attempts to match the pattern, and enters the body if the
match was successful. If the match is irrefutable (when it cannot fail to
match), use a regular `let`-binding instead. For instance:
```compile_pass
```
struct Irrefutable(i32);
let irr = Irrefutable(0);
Expand Down Expand Up @@ -360,7 +360,7 @@ A while-let pattern attempts to match the pattern, and enters the body if the
match was successful. If the match is irrefutable (when it cannot fail to
match), use a regular `let`-binding inside a `loop` instead. For instance:
```compile_pass,no_run
```no_run
struct Irrefutable(i32);
let irr = Irrefutable(0);
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/async-await/async-closure-matches-expr.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// compile-pass
// build-pass
// edition:2018

#![feature(async_await, async_closure)]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// edition:2018
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: migrate mir
//[mir]compile-flags: -Z borrowck=mir

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// edition:2018
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: migrate mir
//[mir]compile-flags: -Z borrowck=mir

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// edition:2018
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: migrate mir
//[mir]compile-flags: -Z borrowck=mir

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// edition:2018
// compile-pass
// build-pass (FIXME(62277): could be check-pass?)
// revisions: migrate mir
//[mir]compile-flags: -Z borrowck=mir

Expand Down
3 changes: 0 additions & 3 deletions src/tools/compiletest/src/header.rs
Original file line number Diff line number Diff line change
Expand Up @@ -591,9 +591,6 @@ impl TestProps {
} else if config.parse_name_directive(ln, "build-pass") {
check_no_run("build-pass");
Some(PassMode::Build)
} else if config.parse_name_directive(ln, "compile-pass") /* compatibility */ {
check_no_run("compile-pass");
Some(PassMode::Build)
} else if config.parse_name_directive(ln, "run-pass") {
if config.mode != Mode::Ui && config.mode != Mode::RunPass /* compatibility */ {
panic!("`run-pass` header is only supported in UI tests")
Expand Down

0 comments on commit 216a187

Please sign in to comment.