Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove check_match from const_eval #59781

Merged
merged 2 commits into from
Apr 13, 2019
Merged

Remove check_match from const_eval #59781

merged 2 commits into from
Apr 13, 2019

Conversation

whitfin
Copy link
Contributor

@whitfin whitfin commented Apr 7, 2019

This fixes #59378.

It seems that the check_match may be unnecessary, so this removes it per instructions provided in the issue. I re-ran the tests for librustc_mir and everything seemed fine!

@rust-highfive
Copy link
Collaborator

r? @cramertj

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 7, 2019
@Centril
Copy link
Contributor

Centril commented Apr 7, 2019

r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned cramertj Apr 7, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:04e56820:start=1554664619584972731,finish=1554664698919645468,duration=79334672737
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
Setting environment variables from .travis.yml
---
[01:06:20] .................................................................................................... 2000/5527
[01:06:23] ...........................................................................................i........ 2100/5527
[01:06:27] .................................................................................................... 2200/5527
[01:06:31] .................................................................................................... 2300/5527
[01:06:35] ..............................FF.................................................................... 2400/5527
[01:06:43] .................................................................................................... 2600/5527
[01:06:43] .................................................................................................... 2600/5527
[01:06:47] .................F.................................................................................. 2700/5527
[01:06:56] .................................................................................................... 2900/5527
[01:06:56] .................................................................................................... 2900/5527
[01:07:00] ...................F................................................................................ 3000/5527
[01:07:07] .................................................................................................... 3200/5527
[01:07:12] .................................................................................................... 3300/5527
[01:07:15] ...........................i........................................................................ 3400/5527
[01:07:19] .................................................................................................... 3500/5527
---
[01:08:38] diff of stderr:
[01:08:38] 
[01:08:38] 5    |         ^^^^^^^^^^^^^
[01:08:38] 6    |
[01:08:38] 7    = note: ...which again requires processing `X::A::{{constant}}#0`, completing the cycle
[01:08:38] - note: cycle used when const-evaluating `X::A::{{constant}}#0`
[01:08:38] + note: cycle used when processing `X::A::{{constant}}#0`
[01:08:38] 10    |
[01:08:38] 10    |
[01:08:38] 11 LL |     A = X::A as isize,
[01:08:38] 
[01:08:38] The actual stderr differed from the expected stderr.
[01:08:38] The actual stderr differed from the expected stderr.
[01:08:38] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-23302-1/issue-23302-1.stderr
[01:08:38] To update references, rerun the tests and pass the `--bless` flag
[01:08:38] To only update this specific test, also pass `--test-args issues/issue-23302-1.rs`
[01:08:38] error: 1 errors occurred comparing output.
[01:08:38] status: exit code: 1
[01:08:38] status: exit code: 1
[01:08:38] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/issues/issue-23302-1.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-23302-1/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-23302-1/auxiliary" "-A" "unused"
[01:08:38] ------------------------------------------
[01:08:38] 
[01:08:38] ------------------------------------------
[01:08:38] stderr:
[01:08:38] stderr:
[01:08:38] ------------------------------------------
[01:08:38] {"message":"cycle detected when processing `X::A::{{constant}}#0`","code":{"code":"E0391","explanation":"\nThis error indicates that some types or traits depend on each other\nand therefore cannot be constructed.\n\nThe following example contains a circular dependency between two traits:\n\n```compile_fail,E0391\ntrait FirstTrait : SecondTrait {\n\n}\n\ntrait SecondTrait : FirstTrait {\n\n}\n```\n"},"level":"error","spans":[{"file_name":"/checkout/src/test/ui/issues/issue-23302-1.rs","byte_start":145,"byte_end":158,"line_start":4,"line_end":4,"column_start":9,"column_end":22,"is_primary":true,"text":[{"text":"    A = X::A as isize, //~ ERROR E0391","highlight_start":9,"highlight_end":22}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"...which again requires processing `X::A::{{constant}}#0`, completing the cycle","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"cycle used when processing `X::A::{{constant}}#0`","code":null,"level":"note","spans":[{"file_name":"/checkout/src/test/ui/issues/issue-23302-1.rs","byte_start":145,"byte_end":158,"line_start":4,"line_end":4,"column_start":9,"column_end":22,"is_primary":true,"text":[{"text":"    A = X::A as isize, //~ ERROR E0391","highlight_start":9,"highlight_end":22}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":null}],"rendered":"error[E0391]: cycle detected when processing `X::A::{{constant}}#0`\n  --> /checkout/src/test/ui/issues/issue-23302-1.rs:4:9\n   |\nLL |     A = X::A as isize, //~ ERROR E0391\n   |         ^^^^^^^^^^^^^\n   |\n   = note: ...which again requires processing `X::A::{{constant}}#0`, completing the cycle\nnote: cycle used when processing `X::A::{{constant}}#0`\n  --> /checkout/src/test/ui/issues/issue-23302-1.rs:4:9\n   |\nLL |     A = X::A as isize, //~ ERROR E0391\n   |         ^^^^^^^^^^^^^\n\n"}
[01:08:38] {"message":"For more information about this error, try `rustc --explain E0391`.","code":null,"level":"","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0391`.\n"}
[01:08:38] 
[01:08:38] ------------------------------------------
[01:08:38] 
---
[01:08:38] diff of stderr:
[01:08:38] 
[01:08:38] 5    |         ^^^^^^^^^^^^^
[01:08:38] 6    |
[01:08:38] 7    = note: ...which again requires processing `Y::A::{{constant}}#0`, completing the cycle
[01:08:38] - note: cycle used when const-evaluating `Y::A::{{constant}}#0`
[01:08:38] + note: cycle used when processing `Y::A::{{constant}}#0`
[01:08:38] 10    |
[01:08:38] 10    |
[01:08:38] 11 LL |     A = Y::B as isize,
[01:08:38] 
[01:08:38] The actual stderr differed from the expected stderr.
[01:08:38] The actual stderr differed from the expected stderr.
[01:08:38] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-23302-2/issue-23302-2.stderr
[01:08:38] To update references, rerun the tests and pass the `--bless` flag
[01:08:38] To only update this specific test, also pass `--test-args issues/issue-23302-2.rs`
[01:08:38] error: 1 errors occurred comparing output.
[01:08:38] status: exit code: 1
[01:08:38] status: exit code: 1
[01:08:38] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/issues/issue-23302-2.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-23302-2/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-23302-2/auxiliary" "-A" "unused"
[01:08:38] ------------------------------------------
[01:08:38] 
[01:08:38] ------------------------------------------
[01:08:38] stderr:
[01:08:38] stderr:
[01:08:38] ------------------------------------------
[01:08:38] {"message":"cycle detected when processing `Y::A::{{constant}}#0`","code":{"code":"E0391","explanation":"\nThis error indicates that some types or traits depend on each other\nand therefore cannot be constructed.\n\nThe following example contains a circular dependency between two traits:\n\n```compile_fail,E0391\ntrait FirstTrait : SecondTrait {\n\n}\n\ntrait SecondTrait : FirstTrait {\n\n}\n```\n"},"level":"error","spans":[{"file_name":"/checkout/src/test/ui/issues/issue-23302-2.rs","byte_start":100,"byte_end":113,"line_start":4,"line_end":4,"column_start":9,"column_end":22,"is_primary":true,"text":[{"text":"    A = Y::B as isize, //~ ERROR E0391","highlight_start":9,"highlight_end":22}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"...which again requires processing `Y::A::{{constant}}#0`, completing the cycle","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"cycle used when processing `Y::A::{{constant}}#0`","code":null,"level":"note","spans":[{"file_name":"/checkout/src/test/ui/issues/issue-23302-2.rs","byte_start":100,"byte_end":113,"line_start":4,"line_end":4,"column_start":9,"column_end":22,"is_primary":true,"text":[{"text":"    A = Y::B as isize, //~ ERROR E0391","highlight_start":9,"highlight_end":22}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":null}],"rendered":"error[E0391]: cycle detected when processing `Y::A::{{constant}}#0`\n  --> /checkout/src/test/ui/issues/issue-23302-2.rs:4:9\n   |\nLL |     A = Y::B as isize, //~ ERROR E0391\n   |         ^^^^^^^^^^^^^\n   |\n   = note: ...which again requires processing `Y::A::{{constant}}#0`, completing the cycle\nnote: cycle used when processing `Y::A::{{constant}}#0`\n  --> /checkout/src/test/ui/issues/issue-23302-2.rs:4:9\n   |\nLL |     A = Y::B as isize, //~ ERROR E0391\n   |         ^^^^^^^^^^^^^\n\n"}
[01:08:38] {"message":"For more information about this error, try `rustc --explain E0391`.","code":null,"level":"","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0391`.\n"}
[01:08:38] 
[01:08:38] ------------------------------------------
[01:08:38] 
[01:08:38] 
[01:08:38] thread '[ui] ui/issues/issue-23302-2.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3425:9
[01:08:38] 
[01:08:38] ---- [ui] ui/issues/issue-36163.rs stdout ----
[01:08:38] diff of stderr:
[01:08:38] 
[01:08:38] 10 LL | const A: isize = Foo::B as isize;
[01:08:38] 11    |                  ^^^^^^^^^^^^^^^
[01:08:38] 12    = note: ...which again requires processing `Foo::B::{{constant}}#0`, completing the cycle
[01:08:38] - note: cycle used when const-evaluating `Foo::B::{{constant}}#0`
[01:08:38] + note: cycle used when processing `Foo::B::{{constant}}#0`
[01:08:38] 15    |
[01:08:38] 16 LL |     B = A,
[01:08:38] 
[01:08:38] 
[01:08:38] 
[01:08:38] The actual stderr differed from the expected stderr.
[01:08:38] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-36163/issue-36163.stderr
[01:08:38] To update references, rerun the tests and pass the `--bless` flag
[01:08:38] To only update this specific test, also pass `--test-args issues/issue-36163.rs`
[01:08:38] error: 1 errors occurred comparing output.
[01:08:38] status: exit code: 1
[01:08:38] status: exit code: 1
[01:08:38] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/issues/issue-36163.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-36163/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-36163/auxiliary" "-A" "unused"
[01:08:38] ------------------------------------------
[01:08:38] 
[01:08:38] ------------------------------------------
[01:08:38] stderr:
[01:08:38] stderr:
[01:08:38] ------------------------------------------
[01:08:38] {"message":"cycle detected when processing `Foo::B::{{constant}}#0`","code":{"code":"E0391","explanation":"\nThis error indicates that some types or traits depend on each other\nand therefore cannot be constructed.\n\nThe following example contains a circular dependency between two traits:\n\n```compile_fail,E0391\ntrait FirstTrait : SecondTrait {\n\n}\n\ntrait SecondTrait : FirstTrait {\n\n}\n```\n"},"level":"error","spans":[{"file_name":"/checkout/src/test/ui/issues/issue-36163.rs","byte_start":54,"byte_end":55,"line_start":4,"line_end":4,"column_start":9,"column_end":10,"is_primary":true,"text":[{"text":"    B = A, //~ ERROR E0391","highlight_start":9,"highlight_end":10}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"...which requires processing `A`...","code":null,"level":"note","spans":[{"file_name":"/checkout/src/test/ui/issues/issue-36163.rs","byte_start":17,"byte_end":32,"line_start":1,"line_end":1,"column_start":18,"column_end":33,"is_primary":true,"text":[{"text":"const A: isize = Foo::B as isize;","highlight_start":18,"highlight_end":33}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":null},{"message":"...which again requires processing `Foo::B::{{constant}}#0`, completing the cycle","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"cycle used when processing `Foo::B::{{constant}}#0`","code":null,"level":"note","spans":[{"file_name":"/checkout/src/test/ui/issues/issue-36163.rs","byte_start":54,"byte_end":55,"line_start":4,"line_end":4,"column_start":9,"column_end":10,"is_primary":true,"text":[{"text":"    B = A, //~ ERROR E0391","highlight_start":9,"highlight_end":10}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":null}],"rendered":"error[E0391]: cycle detected when processing `Foo::B::{{constant}}#0`\n  --> /checkout/src/test/ui/issues/issue-36163.rs:4:9\n   |\nLL |     B = A, //~ ERROR E0391\n   |         ^\n   |\nnote: ...which requires processing `A`...\n  --> /checkout/src/test/ui/issues/issue-36163.rs:1:18\n   |\nLL | const A: isize = Foo::B as isize;\n   |                  ^^^^^^^^^^^^^^^\n   = note: ...which again requires processing `Foo::B::{{constant}}#0`, completing the cycle\nnote: cycle used when processing `Foo::B::{{constant}}#0`\n  --> /checkout/src/test/ui/issues/issue-36163.rs:4:9\n   |\nLL |     B = A, //~ ERROR E0391\n   |         ^\n\n"}
[01:08:38] {"message":"For more information about this error, try `rustc --explain E0391`.","code":null,"level":"","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0391`.\n"}
[01:08:38] 
[01:08:38] ------------------------------------------
[01:08:38] 
[01:08:38] 
[01:08:38] thread '[ui] ui/issues/issue-36163.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3425:9
[01:08:38] 
[01:08:38] ---- [ui] ui/issues/issue-51714.rs stdout ----
[01:08:38] diff of stderr:
[01:08:38] 
[01:08:38] 22 LL |     [(); return while let Some(n) = Some(0) {}];
[01:08:38] 24 
[01:08:38] - warning: irrefutable while-let pattern
[01:08:38] -   --> $DIR/issue-51714.rs:11:17
[01:08:38] -    |
[01:08:38] -    |
[01:08:38] - LL |     [(); return while let Some(n) = Some(0) {}];
[01:08:38] -    |
[01:08:38] -    = note: #[warn(irrefutable_let_patterns)] on by default
[01:08:38] - 
[01:08:38] 33 error: aborting due to 4 previous errors
[01:08:38] 33 error: aborting due to 4 previous errors
[01:08:38] 34 
[01:08:38] 35 For more information about this error, try `rustc --explain E0572`.
[01:08:38] 
[01:08:38] 
[01:08:38] The actual stderr differed from the expected stderr.
[01:08:38] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-51714/issue-51714.stderr
[01:08:38] To update references, rerun the tests and pass the `--bless` flag
[01:08:38] To only update this specific test, also pass `--test-args issues/issue-51714.rs`
[01:08:38] error: 1 errors occurred comparing output.
[01:08:38] status: exit code: 1
[01:08:38] status: exit code: 1
[01:08:38] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/issues/issue-51714.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-51714/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-51714/auxiliary" "-A" "unused"
[01:08:38] ------------------------------------------
[01:08:38] 
[01:08:38] ------------------------------------------
[01:08:38] stderr:
[01:08:38] stderr:
[01:08:38] ------------------------------------------
[01:08:38] {"message":"return statement outside of function body","code":{"code":"E0572","explanation":"\nA return statement was found outside of a function body.\n\nErroneous code example:\n\n```compile_fail,E0572\nconst FOO: u32 = return 0; // error: return statement outside of function body\n\nfn main() {}\n```\n\nTo fix this issue, just remove the return keyword or move the expression into a\nfunction. Example:\n\n```\nconst FOO: u32 = 0;\n\nfn some_fn() -> u32 {\n    return FOO;\n}\n\nfn main() {\n    some_fn();\n}\n```\n"},"level":"error","spans":[{"file_name":"/checkout/src/test/ui/issues/issue-51714.rs","byte_start":25,"byte_end":37,"line_start":2,"line_end":2,"column_start":14,"column_end":26,"is_primary":true,"text":[{"text":"    |_:  [_; return || {}] | {};","highlight_start":14,"highlight_end":26}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":"error[E0572]: return statement outside of function body\n  --> /checkout/src/test/ui/issues/issue-51714.rs:2:14\n   |\nLL |     |_:  [_; return || {}] | {};\n   |              ^^^^^^^^^^^^\n\n"}
[01:08:38] {"message":"return statement outside of function body","code":{"code":"E0572","explanation":"\nA return statement was found outside of a function body.\n\nErroneous code example:\n\n```compile_fail,E0572\nconst FOO: u32 = return 0; // error: return statement outside of function body\n\nfn main() {}\n```\n\nTo fix this issue, just remove the return keyword or move the expression into a\nfunction. Example:\n\n```\nconst FOO: u32 = 0;\n\nfn some_fn() -> u32 {\n    return FOO;\n}\n\nfn main() {\n    some_fn();\n}\n```\n"},"level":"error","spans":[{"file_name":"/checkout/src/test/ui/issues/issue-51714.rs","byte_start":112,"byte_end":124,"line_start":5,"line_end":5,"column_start":10,"column_end":22,"is_primary":true,"text":[{"text":"    [(); return || {}];","highlight_start":10,"highlight_end":22}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":"error[E0572]: return statement outside of function body\n  --> /checkout/src/test/ui/issues/issue-51714.rs:5:10\n   |\nLL |     [(); return || {}];\n   |          ^^^^^^^^^^^^\n\n"}
[01:08:38] {"message":"return statement outside of function body","code":{"code":"E0572","explanation":"\nA return statement was found outside of a function body.\n\nErroneous code example:\n\n```compile_fail,E0572\nconst FOO: u32 = return 0; // error: return statement outside of function body\n\nfn main() {}\n```\n\nTo fix this issue, just remove the return keyword or move the expression into a\nfunction. Example:\n\n```\nconst FOO: u32 = 0;\n\nfn some_fn() -> u32 {\n    return FOO;\n}\n\nfn main() {\n    some_fn();\n}\n```\n"},"level":"error","spans":[{"file_name":"/checkout/src/test/ui/issues/issue-51714.rs","byte_start":194,"byte_end":209,"line_start":8,"line_end":8,"column_start":10,"column_end":25,"is_primary":true,"text":[{"text":"    [(); return |ice| {}];","highlight_start":10,"highlight_end":25}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":"error[E0572]: return statement outside of function body\n  --> /checkout/src/test/ui/issues/issue-51714.rs:8:10\n   |\nLL |     [(); return |ice| {}];\n   |          ^^^^^^^^^^^^^^^\n\n"}
[01:08:38] {"message":"return statement outside of function body","code":{"code":"E0572","explanation":"\nA return statement was found outside of a function body.\n\nErroneous code example:\n\n```compile_fail,E0572\nconst FOO: u32 = return 0; // error: return statement outside of function body\n\nfn main() {}\n```\n\nTo fix this issue, just remove the return keyword or move the expression into a\nfunction. Example:\n\n```\nconst FOO: u32 = 0;\n\nfn some_fn() -> u32 {\n    return FOO;\n}\n\nfn main() {\n    some_fn();\n}\n```\n"},"level":"error","spans":[{"file_name":"/checkout/src/test/ui/issues/issue-51714.rs","byte_start":279,"byte_end":316,"line_start":11,"line_end":11,"column_start":10,"column_end":47,"is_primary":true,"text":[{"text":"    [(); return while let Some(n) = Some(0) {}];","highlight_start":10,"highlight_end":47}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":"error[E0572]: return statement outside of function body\n  --> /checkout/src/test/ui/issues/issue-51714.rs:11:10\n   |\nLL |     [(); return while let Some(n) = Some(0) {}];\n   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n\n"}
[01:08:38] {"message":"For more information about this error, try `rustc --explain E0572`.","code":null,"level":"","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0572`.\n"}
[01:08:38] 
[01:08:38] ------------------------------------------
[01:08:38] 
---
[01:08:38] 
[01:08:38] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:516:22
[01:08:38] 
[01:08:38] 
[01:08:38] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:08:38] 
[01:08:38] 
[01:08:38] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:08:38] Build completed unsuccessfully in 0:04:29
[01:08:38] Build completed unsuccessfully in 0:04:29
[01:08:38] make: *** [check] Error 1
[01:08:38] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:1867ebb2
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sun Apr  7 20:27:06 UTC 2019
---
travis_time:end:008d9e27:start=1554668828251752419,finish=1554668828259451904,duration=7699485
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:2378130a
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0767374e
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

Copy link
Contributor

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to run ./x.py test --stage 1 src/test/ui --bless in order to update the changed diagnostics due to cyclic errors having a different backtrace now.

@whitfin
Copy link
Contributor Author

whitfin commented Apr 8, 2019

@oli-obk got it! I'll get that pushed up ASAP.

@whitfin
Copy link
Contributor Author

whitfin commented Apr 8, 2019

@oli-obk okay, I have updated the stderr for those 3 tests with the different backtrace... but ui/issues/issue-51714.rs looks a little weird to me. It's stopped showing a warning for irrefutable while-let pattern. Is this expected given the removal of check_match? If so I can update that, but wanted to make sure before blindly changing it.

@oli-obk
Copy link
Contributor

oli-obk commented Apr 8, 2019

Yes I think that warning was redundant anyway.

@@ -22,14 +22,6 @@ error[E0572]: return statement outside of function body
LL | [(); return while let Some(n) = Some(0) {}];
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

warning: irrefutable while-let pattern
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that I think of it.... This is actually a diagnostics improvement. This now-removed diagnostic is just plain wrong.

@oli-obk
Copy link
Contributor

oli-obk commented Apr 8, 2019

@bors r+

thanks!

@bors
Copy link
Contributor

bors commented Apr 8, 2019

📌 Commit d4d2317 has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 8, 2019
tcx.mir_const_qualif(def_id);
}

// Do not continue into miri if typeck errors occurred; it will fail horribly
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be worth preserving this comment.

Centril added a commit to Centril/rust that referenced this pull request Apr 12, 2019
Remove check_match from const_eval

This fixes rust-lang#59378.

It seems that the `check_match` may be unnecessary, so this removes it per instructions provided in the issue. I re-ran the tests for `librustc_mir` and everything seemed fine!
bors added a commit that referenced this pull request Apr 13, 2019
Rollup of 8 pull requests

Successful merges:

 - #59781 (Remove check_match from const_eval)
 - #59820 (proc_macro: stop using LEB128 for RPC.)
 - #59846 (clarify what the item is in "not a module" error)
 - #59847 (Error when using `catch` after `try`)
 - #59859 (Suggest removing `?` to resolve type errors.)
 - #59862 (Tweak unstable diagnostic output)
 - #59866 (Recover from missing semicolon based on the found token)
 - #59892 (Impl RawFd conversion traits for WASI TcpListener, TcpStream and UdpSocket)

Failed merges:

r? @ghost
@bors bors merged commit d4d2317 into rust-lang:master Apr 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Follow up on const_eval.rs check_match call
7 participants