diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-07-05 20:26:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-05 20:26:59 +0200 |
| commit | 216a1871bbc7326fce5e69ff5965fa026d04a2d0 (patch) | |
| tree | 46fcb5e97b469d8980ae97650d80d9cc85b0a95e /src | |
| parent | 30aa2450e16f2454193b3c501ca154008dc9e67a (diff) | |
| parent | 1640ab2e1f92e943e5cc08856f9fb851de1fde4c (diff) | |
| download | rust-216a1871bbc7326fce5e69ff5965fa026d04a2d0.tar.gz rust-216a1871bbc7326fce5e69ff5965fa026d04a2d0.zip | |
Rollup merge of #62369 - JohnTitor:remove-compile-pass, r=petrochenkov
Remove `compile-pass` from compiletest This is a part of #62277. Removes `compile-pass` from compiletest (and modify some tests' annotations). r? @Centril
Diffstat (limited to 'src')
8 files changed, 7 insertions, 10 deletions
diff --git a/src/doc/rustc-guide b/src/doc/rustc-guide -Subproject abf512fc9cc969dcbea69aa15b44586bbeb13c2 +Subproject b5a2b9353c661000378415ecfeb757eb7df42d6 diff --git a/src/librustc_mir/error_codes.rs b/src/librustc_mir/error_codes.rs index 4807782c663..618c047e773 100644 --- a/src/librustc_mir/error_codes.rs +++ b/src/librustc_mir/error_codes.rs @@ -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); @@ -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); diff --git a/src/test/ui/async-await/async-closure-matches-expr.rs b/src/test/ui/async-await/async-closure-matches-expr.rs index 90bd51ec5d0..1c192a4d1d8 100644 --- a/src/test/ui/async-await/async-closure-matches-expr.rs +++ b/src/test/ui/async-await/async-closure-matches-expr.rs @@ -1,4 +1,4 @@ -// compile-pass +// build-pass // edition:2018 #![feature(async_await, async_closure)] diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-elided.rs b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-elided.rs index 5f484773405..553dea7aa6e 100644 --- a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-elided.rs +++ b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-elided.rs @@ -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 diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-existential.rs b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-existential.rs index c17ae6f0519..43915e05e88 100644 --- a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-existential.rs +++ b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original-existential.rs @@ -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 diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original.rs b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original.rs index 31891ef15c7..c0930ec5944 100644 --- a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original.rs +++ b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-original.rs @@ -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 diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-other.rs b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-other.rs index 29c997085d8..ed36bda7db7 100644 --- a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-other.rs +++ b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-pick-other.rs @@ -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 diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 52f777db2da..b8008152e2a 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -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") |
