Rollup of 10 pull requests #70110

Centril · 2020-03-18T15:56:16Z

Successful merges:

keyword docs for else and inkeyword docs for else and in. #67749 (keyword docs for else and inkeyword docs for else and in.)
clean up E0308 explanation #69139 (clean up E0308 explanation)
Erase regions in writeback #69189 (Erase regions in writeback)
Don't unwind when hitting the macro expansion recursion limit #69497 (Don't unwind when hitting the macro expansion recursion limit)
Smaller and more correct generator codegen #69814 (Smaller and more correct generator codegen)
Miri error reform #69839 (Miri error reform)
Make methods declared by newtype_index macro const #69899 (Make methods declared by newtype_index macro const)
Remove some imports to the rustc crate #69920 (Remove some imports to the rustc crate)
Expand: nix all fatal errors #70074 (Expand: nix all fatal errors)
Tidy: fix running rustfmt twice #70106 (Tidy: fix running rustfmt twice)

Failed merges:

This didn't cause issues before since generator types were always considered to "need drop", leading to unwind paths (including a `Resume` block) always getting generated.

The indices do not matter here, and this fixes an index out of bounds panic when compiling a generator that can unwind but not return.

Co-Authored-By: bjorn3 <bjorn3@users.noreply.github.com>

Also slightly refactor pointer bounds checks to avoid creating unnecessary temporary Errors

It was unused.

Regions in TypeckTables will be erased, so are unusable for error reporting.

Also skip duplicated region solving entirely with `-Zborrowck=mir`.

keyword docs for else and inkeyword docs for else and in. First cut of else and in keyword docs. Comments and suggestions more than welcome.

@Dylan-DPC

…an-DPC clean up E0308 explanation r? @Dylan-DPC

@nikomatsakis

…komatsakis Erase regions in writeback Regions in `TypeckTables` (except canonicalized user annotations) are now erased. Further, we no longer do lexical region solving on item bodies with `-Zborrowck=mir`. cc rust-lang#68261 r? @nikomatsakis

@petrochenkov

…nkov Don't unwind when hitting the macro expansion recursion limit This removes one use of `FatalError.raise()`. r? @petrochenkov

@Zoxc

Smaller and more correct generator codegen This removes unnecessary panicking branches in the resume function when the generator can not return or unwind, respectively. Closes rust-lang#66100 It also addresses the correctness concerns wrt poisoning on unwind. These are not currently a soundness issue because any operation *inside* a generator that could possibly unwind will result in a cleanup path for dropping it, ultimately reaching a `Resume` terminator, which we already handled correctly. Future MIR optimizations might optimize that out, though. r? @Zoxc

@oli-obk

Miri error reform Some time ago we started moving Miri errors into a few distinct categories, but we never classified all the old errors. That's what this PR does. ~~This is on top of rust-lang#69762; [relative diff](RalfJung/rust@validity-errors...RalfJung:miri-error-cleanup).~~ r? @oli-obk Fixes rust-lang/const-eval#4

…=oli-obk Make methods declared by `newtype_index` macro `const` Crates that use the macro to define an `Idx` type need to enable `#![feature(const_if_match, const_panic)]`.

@Zoxc

Remove some imports to the rustc crate - When we have `NestedVisitorMap::None`, we use `type Map = dyn intravisit::Map<'v>;` instead of the actual map. This doesn't actually result in dynamic dispatch (in the future we may want to use an associated type default to simplify the code). - Use `rustc_session::` imports instead of `rustc::{session, lint}`. r? @Zoxc

@petrochenkov

Expand: nix all fatal errors Basically, we go after all `.span_fatal` / `FatalError.raise()` and similar things and remove them one by one until there are no fatal errors left. r? @petrochenkov

…mulacrum Tidy: fix running rustfmt twice `./x.py test tidy` runs rustfmt twice. This is because `Build::build` runs `execute_cli` twice (once dry, once not). This can be quite slow (and prints a bunch of things twice). I'm not sure if this is really the best place to check the dry_run status.

Centril · 2020-03-18T15:56:35Z

@bors r+ p=10 rollup=never

bors · 2020-03-18T15:56:37Z

📌 Commit f063933 has been approved by Centril

bors · 2020-03-18T15:57:24Z

⌛ Testing commit f063933 with merge 3ac100a5ec1e2d6dd4036f66d0a71ef1c5117b8a...

Centril · 2020-03-18T16:03:15Z

Closing the tree as it is easier to conduct rollup ops this way when I'm awake, @bors treeclosed=5

rust-highfive · 2020-03-18T17:01:00Z

The job x86_64-apple of your PR failed (pretty log, 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.

2020-03-18T16:59:20.4688260Z + 
2020-03-18T16:59:20.4688450Z + note: trace_macro
2020-03-18T16:59:20.4689040Z +   --> $DIR/trace_faulty_macros.rs:38:13
2020-03-18T16:59:20.4689310Z +    |
2020-03-18T16:59:20.4689520Z + LL |     let a = pat_macro!();
2020-03-18T16:59:20.4690000Z +    |
2020-03-18T16:59:20.4690000Z +    |
2020-03-18T16:59:20.4690250Z +    = note: expanding `pat_macro! {  }`
2020-03-18T16:59:20.4690620Z +    = note: to `pat_macro ! (A { a : a, b : 0, c : _, .. }) ;`
2020-03-18T16:59:20.4691080Z +    = note: expanding `pat_macro! { A { a : a, b : 0, c : _, .. } }`
2020-03-18T16:59:20.4691500Z +    = note: to `A { a: a, b: 0, c: _, .. }`
2020-03-18T16:59:20.4692250Z + error: aborting due to 4 previous errors
2020-03-18T16:59:20.4692520Z 64 
2020-03-18T16:59:20.4692680Z 65 
2020-03-18T16:59:20.4692790Z 
2020-03-18T16:59:20.4692790Z 
2020-03-18T16:59:20.4692900Z 
2020-03-18T16:59:20.4693150Z The actual stderr differed from the expected stderr.
2020-03-18T16:59:20.4694150Z Actual stderr saved to /Users/runner/runners/2.165.2/work/1/s/build/x86_64-apple-darwin/test/ui/macros/trace_faulty_macros/trace_faulty_macros.stderr
2020-03-18T16:59:20.4695080Z To update references, rerun the tests and pass the `--bless` flag
2020-03-18T16:59:20.4695890Z To only update this specific test, also pass `--test-args macros/trace_faulty_macros.rs`
2020-03-18T16:59:20.4696440Z error: 1 errors occurred comparing output.
2020-03-18T16:59:20.4696710Z status: exit code: 1
2020-03-18T16:59:20.4696710Z status: exit code: 1
2020-03-18T16:59:20.4699310Z command: "/Users/runner/runners/2.165.2/work/1/s/build/x86_64-apple-darwin/stage2/bin/rustc" "/Users/runner/runners/2.165.2/work/1/s/src/test/ui/macros/trace_faulty_macros.rs" "-Zthreads=1" "--target=x86_64-apple-darwin" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/Users/runner/runners/2.165.2/work/1/s/build/x86_64-apple-darwin/test/ui/macros/trace_faulty_macros" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/Users/runner/runners/2.165.2/work/1/s/build/x86_64-apple-darwin/native/rust-test-helpers" "-A" "unused" "-Z" "trace-macros" "-L" "/Users/runner/runners/2.165.2/work/1/s/build/x86_64-apple-darwin/test/ui/macros/trace_faulty_macros/auxiliary"
2020-03-18T16:59:20.4701560Z ------------------------------------------
2020-03-18T16:59:20.4701790Z 
2020-03-18T16:59:20.4702320Z ------------------------------------------
2020-03-18T16:59:20.4702580Z stderr:
2020-03-18T16:59:20.4702580Z stderr:
2020-03-18T16:59:20.4703110Z ------------------------------------------
2020-03-18T16:59:20.4703440Z error: no rules expected the token `bcd`
2020-03-18T16:59:20.4704220Z   --> /Users/runner/runners/2.165.2/work/1/s/src/test/ui/macros/trace_faulty_macros.rs:7:26
2020-03-18T16:59:20.4704580Z    |
2020-03-18T16:59:20.4704810Z LL | macro_rules! my_faulty_macro {
2020-03-18T16:59:20.4705450Z    | ---------------------------- when calling this macro
2020-03-18T16:59:20.4705770Z LL |     () => {
2020-03-18T16:59:20.4706060Z LL |         my_faulty_macro!(bcd); //~ ERROR no rules
2020-03-18T16:59:20.4706760Z ...
2020-03-18T16:59:20.4706760Z ...
2020-03-18T16:59:20.4706960Z LL |     my_faulty_macro!();
2020-03-18T16:59:20.4708230Z    |
2020-03-18T16:59:20.4709050Z    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
2020-03-18T16:59:20.4709400Z 
2020-03-18T16:59:20.4709590Z note: trace_macro
2020-03-18T16:59:20.4709590Z note: trace_macro
2020-03-18T16:59:20.4710450Z   --> /Users/runner/runners/2.165.2/work/1/s/src/test/ui/macros/trace_faulty_macros.rs:33:5
2020-03-18T16:59:20.4710830Z    |
2020-03-18T16:59:20.4711030Z LL |     my_faulty_macro!();
2020-03-18T16:59:20.4711510Z    |
2020-03-18T16:59:20.4711510Z    |
2020-03-18T16:59:20.4711750Z    = note: expanding `my_faulty_macro! {  }`
2020-03-18T16:59:20.4712080Z    = note: to `my_faulty_macro ! (bcd) ;`
2020-03-18T16:59:20.4712410Z    = note: expanding `my_faulty_macro! { bcd }`
2020-03-18T16:59:20.4720170Z error: recursion limit reached while expanding `my_recursive_macro!`
2020-03-18T16:59:20.4721250Z   --> /Users/runner/runners/2.165.2/work/1/s/src/test/ui/macros/trace_faulty_macros.rs:22:9
2020-03-18T16:59:20.4721650Z    |
2020-03-18T16:59:20.4721650Z    |
2020-03-18T16:59:20.4721930Z LL |         my_recursive_macro!(); //~ ERROR recursion limit
2020-03-18T16:59:20.4722500Z ...
2020-03-18T16:59:20.4722500Z ...
2020-03-18T16:59:20.4722710Z LL |     my_recursive_macro!();
2020-03-18T16:59:20.4723970Z    |
2020-03-18T16:59:20.4723970Z    |
2020-03-18T16:59:20.4724350Z    = help: consider adding a `#![recursion_limit="8"]` attribute to your crate (`trace_faulty_macros`)
2020-03-18T16:59:20.4725740Z 
2020-03-18T16:59:20.4725920Z note: trace_macro
2020-03-18T16:59:20.4726680Z   --> /Users/runner/runners/2.165.2/work/1/s/src/test/ui/macros/trace_faulty_macros.rs:34:5
2020-03-18T16:59:20.4727040Z    |
2020-03-18T16:59:20.4727040Z    |
2020-03-18T16:59:20.4727260Z LL |     my_recursive_macro!();
2020-03-18T16:59:20.4727750Z    |
2020-03-18T16:59:20.4727750Z    |
2020-03-18T16:59:20.4728010Z    = note: expanding `my_recursive_macro! {  }`
2020-03-18T16:59:20.4728340Z    = note: to `my_recursive_macro ! () ;`
2020-03-18T16:59:20.4728670Z    = note: expanding `my_recursive_macro! {  }`
2020-03-18T16:59:20.4729000Z    = note: to `my_recursive_macro ! () ;`
2020-03-18T16:59:20.4729340Z    = note: expanding `my_recursive_macro! {  }`
2020-03-18T16:59:20.4729670Z    = note: to `my_recursive_macro ! () ;`
2020-03-18T16:59:20.4730000Z    = note: expanding `my_recursive_macro! {  }`
2020-03-18T16:59:20.4730330Z    = note: to `my_recursive_macro ! () ;`
2020-03-18T16:59:20.4730540Z 
2020-03-18T16:59:20.4730830Z error: expected expression, found `A { a: a, b: 0, c: _, .. }`
2020-03-18T16:59:20.4732090Z    |
2020-03-18T16:59:20.4732090Z    |
2020-03-18T16:59:20.4732340Z LL |         $a //~ ERROR expected expression
2020-03-18T16:59:20.4732880Z ...
2020-03-18T16:59:20.4733090Z LL |     let a = pat_macro!();
2020-03-18T16:59:20.4733750Z    |             ------------ in this macro invocation
2020-03-18T16:59:20.4734040Z    |
---
2020-03-18T16:59:20.4738550Z    |
2020-03-18T16:59:20.4738770Z LL |     let a = pat_macro!();
2020-03-18T16:59:20.4739270Z    |             ^^^^^^^^^^^^
2020-03-18T16:59:20.4739490Z    |
2020-03-18T16:59:20.4739720Z    = note: expanding `pat_macro! {  }`
2020-03-18T16:59:20.4740100Z    = note: to `pat_macro ! (A { a : a, b : 0, c : _, .. }) ;`
2020-03-18T16:59:20.4740560Z    = note: expanding `pat_macro! { A { a : a, b : 0, c : _, .. } }`
2020-03-18T16:59:20.4740970Z    = note: to `A { a: a, b: 0, c: _, .. }`
2020-03-18T16:59:20.4741420Z error: aborting due to 4 previous errors
2020-03-18T16:59:20.4741610Z 
2020-03-18T16:59:20.4741730Z 
2020-03-18T16:59:20.4742340Z ------------------------------------------
---
2020-03-18T16:59:20.4758470Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:348:22
2020-03-18T16:59:20.4759030Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-03-18T16:59:20.4773750Z 
2020-03-18T16:59:20.4774040Z 
2020-03-18T16:59:20.4780440Z command did not execute successfully: "/Users/runner/runners/2.165.2/work/1/s/build/x86_64-apple-darwin/stage0-tools-bin/compiletest" "--compile-lib-path" "/Users/runner/runners/2.165.2/work/1/s/build/x86_64-apple-darwin/stage2/lib" "--run-lib-path" "/Users/runner/runners/2.165.2/work/1/s/build/x86_64-apple-darwin/stage2/lib/rustlib/x86_64-apple-darwin/lib" "--rustc-path" "/Users/runner/runners/2.165.2/work/1/s/build/x86_64-apple-darwin/stage2/bin/rustc" "--src-base" "/Users/runner/runners/2.165.2/work/1/s/src/test/ui" "--build-base" "/Users/runner/runners/2.165.2/work/1/s/build/x86_64-apple-darwin/test/ui" "--stage-id" "stage2-x86_64-apple-darwin" "--mode" "ui" "--target" "x86_64-apple-darwin" "--host" "x86_64-apple-darwin" "--llvm-filecheck" "/Users/runner/runners/2.165.2/work/1/s/build/x86_64-apple-darwin/llvm/build/bin/FileCheck" "--nodejs" "/usr/local/bin/node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/Users/runner/runners/2.165.2/work/1/s/build/x86_64-apple-darwin/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/Users/runner/runners/2.165.2/work/1/s/build/x86_64-apple-darwin/native/rust-test-helpers" "--docck-python" "/usr/local/bin/python2.7" "--lldb-python" "/usr/bin/python3" "--lldb-version" "lldb-1100.0.30.12\nApple Swift version 5.1.3 (swiftlang-1100.0.282.1 clang-1100.0.33.15)\n" "--lldb-python-dir" "/Applications/Xcode_11.3.1.app/Contents/SharedFrameworks/LLDB.framework/Resources/Python3" "--llvm-version" "9.0.1-rust-1.44.0-nightly\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2020-03-18T16:59:20.4784640Z 
2020-03-18T16:59:20.4784770Z 
2020-03-18T16:59:20.4788070Z failed to run: /Users/runner/runners/2.165.2/work/1/s/build/bootstrap/debug/bootstrap test
2020-03-18T16:59:20.4788580Z Build completed unsuccessfully in 0:55:38
2020-03-18T16:59:20.4788580Z Build completed unsuccessfully in 0:55:38
2020-03-18T16:59:20.4838840Z == clock drift check ==
2020-03-18T16:59:20.4892670Z   local time: Wed Mar 18 16:59:20 UTC 2020
2020-03-18T16:59:20.5465330Z   network time: Wed, 18 Mar 2020 16:59:20 GMT
2020-03-18T16:59:20.5466860Z == end clock drift check ==
2020-03-18T16:59:20.5507210Z 
2020-03-18T16:59:20.5580880Z ##[error]Bash exited with code '1'.
2020-03-18T16:59:20.5668800Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-03-18T16:59:20.5675050Z ==============================================================================
2020-03-18T16:59:20.5675470Z Task         : Get sources
2020-03-18T16:59:20.5676170Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 @rust-lang/infra. (Feature Requests)

rust-highfive · 2020-03-18T17:01:11Z

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, 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.

2020-03-18T15:57:01.0280532Z ========================== Starting Command Output ===========================
2020-03-18T15:57:01.0283232Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/00aa45d3-c38c-4e69-99de-4512b710f80a.sh
2020-03-18T15:57:01.0283509Z 
2020-03-18T15:57:01.0287536Z ##[section]Finishing: Disable git automatic line ending conversion
2020-03-18T15:57:01.0306351Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70110/merge to s
2020-03-18T15:57:01.0309417Z Task         : Get sources
2020-03-18T15:57:01.0309700Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-18T15:57:01.0309996Z Version      : 1.0.0
2020-03-18T15:57:01.0310184Z Author       : Microsoft
---
2020-03-18T15:57:02.0387909Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-03-18T15:57:02.0392821Z ##[command]git config gc.auto 0
2020-03-18T15:57:02.0396224Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-03-18T15:57:02.0399646Z ##[command]git config --get-all http.proxy
2020-03-18T15:57:02.0405353Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/70110/merge:refs/remotes/pull/70110/merge
---
2020-03-18T16:50:12.8998179Z .................................................................................................... 1700/9798
2020-03-18T16:50:17.1788267Z .................................................................................................... 1800/9798
2020-03-18T16:50:28.2719924Z ..........................................................................i......................... 1900/9798
2020-03-18T16:50:34.5034649Z .................................................................................................... 2000/9798
2020-03-18T16:50:42.1374256Z ................................................................iiiii............................... 2100/9798
2020-03-18T16:50:59.1781891Z .................................................................................................... 2300/9798
2020-03-18T16:51:01.3885921Z .................................................................................................... 2400/9798
2020-03-18T16:51:04.2222580Z .................................................................................................... 2500/9798
2020-03-18T16:51:23.3823893Z .................................................................................................... 2600/9798
---
2020-03-18T16:53:56.5227932Z ....................................i...............i............................................... 5000/9798
2020-03-18T16:54:05.2335298Z .................................................................................................... 5100/9798
2020-03-18T16:54:11.3254854Z ...............................................................................i.................... 5200/9798
2020-03-18T16:54:16.7299361Z .................................................................................................... 5300/9798
2020-03-18T16:54:26.3807511Z ............................................................ii.ii........i...i...................... 5400/9798
2020-03-18T16:54:30.5327928Z ...................................................................................................i 5500/9798
2020-03-18T16:54:43.5220870Z .................................................................................................... 5700/9798
2020-03-18T16:54:49.5635092Z ......................................................i............................................. 5800/9798
2020-03-18T16:54:55.8766529Z .....................................................F.............................................. 5900/9798
2020-03-18T16:55:04.7918033Z .................................................................................................... 6000/9798
2020-03-18T16:55:04.7918033Z .................................................................................................... 6000/9798
2020-03-18T16:55:11.3512144Z ................................................ii...i..ii...........i.............................. 6100/9798
2020-03-18T16:55:30.8653362Z .................................................................................................... 6300/9798
2020-03-18T16:55:37.6317789Z .................................................................................................... 6400/9798
2020-03-18T16:55:37.6317789Z .................................................................................................... 6400/9798
2020-03-18T16:55:43.2892200Z ..............................................................................i..ii................. 6500/9798
2020-03-18T16:56:04.1428726Z .................................................................................................... 6700/9798
2020-03-18T16:56:12.6521810Z ............................................................................i....................... 6800/9798
2020-03-18T16:56:14.7130147Z .................................................................................................... 6900/9798
2020-03-18T16:56:16.8303146Z .................................................................................................... 7000/9798
---
2020-03-18T16:57:54.6325878Z .................................................................................................... 7800/9798
2020-03-18T16:57:59.8508253Z .................................................................................................... 7900/9798
2020-03-18T16:58:05.6790084Z ...............................................................i.................................... 8000/9798
2020-03-18T16:58:15.2458426Z .................................................................................................... 8100/9798
2020-03-18T16:58:20.5130782Z ............iiiiiiiiii.i............................................................................ 8200/9798
2020-03-18T16:58:33.7548685Z .................................................................................................... 8400/9798
2020-03-18T16:58:41.5034941Z .................................................................................................... 8500/9798
2020-03-18T16:58:54.3482405Z .................................................................................................... 8600/9798
2020-03-18T16:59:00.6627083Z .................................................................................................... 8700/9798
---
2020-03-18T17:00:49.7870432Z + 
2020-03-18T17:00:49.7870705Z + note: trace_macro
2020-03-18T17:00:49.7871240Z +   --> $DIR/trace_faulty_macros.rs:38:13
2020-03-18T17:00:49.7871596Z +    |
2020-03-18T17:00:49.7871894Z + LL |     let a = pat_macro!();
2020-03-18T17:00:49.7872550Z +    |
2020-03-18T17:00:49.7872550Z +    |
2020-03-18T17:00:49.7872868Z +    = note: expanding `pat_macro! {  }`
2020-03-18T17:00:49.7873550Z +    = note: to `pat_macro ! (A { a : a, b : 0, c : _, .. }) ;`
2020-03-18T17:00:49.7874099Z +    = note: expanding `pat_macro! { A { a : a, b : 0, c : _, .. } }`
2020-03-18T17:00:49.7874591Z +    = note: to `A { a: a, b: 0, c: _, .. }`
2020-03-18T17:00:49.7875252Z + error: aborting due to 4 previous errors
2020-03-18T17:00:49.7875561Z 64 
2020-03-18T17:00:49.7875816Z 65 
2020-03-18T17:00:49.7876033Z 
2020-03-18T17:00:49.7876033Z 
2020-03-18T17:00:49.7876244Z 
2020-03-18T17:00:49.7876565Z The actual stderr differed from the expected stderr.
2020-03-18T17:00:49.7877765Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/macros/trace_faulty_macros/trace_faulty_macros.stderr
2020-03-18T17:00:49.7878564Z To update references, rerun the tests and pass the `--bless` flag
2020-03-18T17:00:49.7879528Z To only update this specific test, also pass `--test-args macros/trace_faulty_macros.rs`
2020-03-18T17:00:49.7880216Z error: 1 errors occurred comparing output.
2020-03-18T17:00:49.7880757Z status: exit code: 1
2020-03-18T17:00:49.7880757Z status: exit code: 1
2020-03-18T17:00:49.7882916Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/macros/trace_faulty_macros.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/macros/trace_faulty_macros" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-A" "unused" "-Z" "trace-macros" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/macros/trace_faulty_macros/auxiliary"
2020-03-18T17:00:49.7884792Z ------------------------------------------
2020-03-18T17:00:49.7885105Z 
2020-03-18T17:00:49.7885630Z ------------------------------------------
2020-03-18T17:00:49.7886120Z stderr:
2020-03-18T17:00:49.7886120Z stderr:
2020-03-18T17:00:49.7886649Z ------------------------------------------
2020-03-18T17:00:49.7887037Z error: no rules expected the token `bcd`
2020-03-18T17:00:49.7887662Z   --> /checkout/src/test/ui/macros/trace_faulty_macros.rs:7:26
2020-03-18T17:00:49.7888330Z    |
2020-03-18T17:00:49.7888726Z LL | macro_rules! my_faulty_macro {
2020-03-18T17:00:49.7889343Z    | ---------------------------- when calling this macro
2020-03-18T17:00:49.7889739Z LL |     () => {
2020-03-18T17:00:49.7890161Z LL |         my_faulty_macro!(bcd); //~ ERROR no rules
2020-03-18T17:00:49.7891227Z ...
2020-03-18T17:00:49.7891227Z ...
2020-03-18T17:00:49.7891417Z LL |     my_faulty_macro!();
2020-03-18T17:00:49.7892142Z    |
2020-03-18T17:00:49.7892819Z    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
2020-03-18T17:00:49.7893241Z 
2020-03-18T17:00:49.7893421Z note: trace_macro
2020-03-18T17:00:49.7893421Z note: trace_macro
2020-03-18T17:00:49.7894000Z   --> /checkout/src/test/ui/macros/trace_faulty_macros.rs:33:5
2020-03-18T17:00:49.7894374Z    |
2020-03-18T17:00:49.7894579Z LL |     my_faulty_macro!();
2020-03-18T17:00:49.7895485Z    |
2020-03-18T17:00:49.7895485Z    |
2020-03-18T17:00:49.7895716Z    = note: expanding `my_faulty_macro! {  }`
2020-03-18T17:00:49.7896008Z    = note: to `my_faulty_macro ! (bcd) ;`
2020-03-18T17:00:49.7896398Z    = note: expanding `my_faulty_macro! { bcd }`
2020-03-18T17:00:49.7896857Z error: recursion limit reached while expanding `my_recursive_macro!`
2020-03-18T17:00:49.7898073Z   --> /checkout/src/test/ui/macros/trace_faulty_macros.rs:22:9
2020-03-18T17:00:49.7898442Z    |
2020-03-18T17:00:49.7898442Z    |
2020-03-18T17:00:49.7898765Z LL |         my_recursive_macro!(); //~ ERROR recursion limit
2020-03-18T17:00:49.7899434Z ...
2020-03-18T17:00:49.7899434Z ...
2020-03-18T17:00:49.7899981Z LL |     my_recursive_macro!();
2020-03-18T17:00:49.7902184Z    |
2020-03-18T17:00:49.7902184Z    |
2020-03-18T17:00:49.7904121Z    = help: consider adding a `#![recursion_limit="8"]` attribute to your crate (`trace_faulty_macros`)
2020-03-18T17:00:49.7907301Z 
2020-03-18T17:00:49.7907564Z note: trace_macro
2020-03-18T17:00:49.7908052Z   --> /checkout/src/test/ui/macros/trace_faulty_macros.rs:34:5
2020-03-18T17:00:49.7908436Z    |
2020-03-18T17:00:49.7908436Z    |
2020-03-18T17:00:49.7908640Z LL |     my_recursive_macro!();
2020-03-18T17:00:49.7909153Z    |
2020-03-18T17:00:49.7909153Z    |
2020-03-18T17:00:49.7909394Z    = note: expanding `my_recursive_macro! {  }`
2020-03-18T17:00:49.7909774Z    = note: to `my_recursive_macro ! () ;`
2020-03-18T17:00:49.7910094Z    = note: expanding `my_recursive_macro! {  }`
2020-03-18T17:00:49.7910473Z    = note: to `my_recursive_macro ! () ;`
2020-03-18T17:00:49.7910874Z    = note: expanding `my_recursive_macro! {  }`
2020-03-18T17:00:49.7911256Z    = note: to `my_recursive_macro ! () ;`
2020-03-18T17:00:49.7911823Z    = note: expanding `my_recursive_macro! {  }`
2020-03-18T17:00:49.7912201Z    = note: to `my_recursive_macro ! () ;`
2020-03-18T17:00:49.7912383Z 
2020-03-18T17:00:49.7912635Z error: expected expression, found `A { a: a, b: 0, c: _, .. }`
2020-03-18T17:00:49.7913615Z    |
2020-03-18T17:00:49.7913615Z    |
2020-03-18T17:00:49.7913825Z LL |         $a //~ ERROR expected expression
2020-03-18T17:00:49.7914365Z ...
2020-03-18T17:00:49.7914547Z LL |     let a = pat_macro!();
2020-03-18T17:00:49.7915213Z    |             ------------ in this macro invocation
2020-03-18T17:00:49.7915524Z    |
---
2020-03-18T17:00:49.7921002Z    |
2020-03-18T17:00:49.7921187Z LL |     let a = pat_macro!();
2020-03-18T17:00:49.7922915Z    |             ^^^^^^^^^^^^
2020-03-18T17:00:49.7923199Z    |
2020-03-18T17:00:49.7923406Z    = note: expanding `pat_macro! {  }`
2020-03-18T17:00:49.7924026Z    = note: to `pat_macro ! (A { a : a, b : 0, c : _, .. }) ;`
2020-03-18T17:00:49.7924523Z    = note: expanding `pat_macro! { A { a : a, b : 0, c : _, .. } }`
2020-03-18T17:00:49.7924997Z    = note: to `A { a: a, b: 0, c: _, .. }`
2020-03-18T17:00:49.7925590Z error: aborting due to 4 previous errors
2020-03-18T17:00:49.7925773Z 
2020-03-18T17:00:49.7925994Z 
2020-03-18T17:00:49.7926513Z ------------------------------------------
---
2020-03-18T17:00:49.7929381Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:348:22
2020-03-18T17:00:49.7929903Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-03-18T17:00:49.7930156Z 
2020-03-18T17:00:49.7930256Z 
2020-03-18T17:00:49.7934073Z 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-7/bin/FileCheck" "--nodejs" "/usr/bin/node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -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" "7.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2020-03-18T17:00:49.7937089Z 
2020-03-18T17:00:49.7937211Z 
2020-03-18T17:00:49.7937758Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --exclude src/tools/tidy
2020-03-18T17:00:49.7938263Z Build completed unsuccessfully in 0:59:50
2020-03-18T17:00:49.7938263Z Build completed unsuccessfully in 0:59:50
2020-03-18T17:00:49.7938614Z == clock drift check ==
2020-03-18T17:00:49.7938905Z   local time: Wed Mar 18 17:00:49 UTC 2020
2020-03-18T17:00:49.7939315Z   network time: Wed, 18 Mar 2020 17:00:49 GMT
2020-03-18T17:00:49.7939678Z == end clock drift check ==
2020-03-18T17:00:50.1066048Z 
2020-03-18T17:00:50.1169679Z ##[error]Bash exited with code '1'.
2020-03-18T17:00:50.1183418Z ##[section]Finishing: Run build
2020-03-18T17:00:50.1240085Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70110/merge to s
2020-03-18T17:00:50.1245341Z Task         : Get sources
2020-03-18T17:00:50.1245678Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-18T17:00:50.1245988Z Version      : 1.0.0
2020-03-18T17:00:50.1246230Z Author       : Microsoft
2020-03-18T17:00:50.1246230Z Author       : Microsoft
2020-03-18T17:00:50.1246573Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-03-18T17:00:50.1246970Z ==============================================================================
2020-03-18T17:00:50.4545174Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-03-18T17:00:50.4596022Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/70110/merge to s
2020-03-18T17:00:50.4688412Z Cleaning up task key
2020-03-18T17:00:50.4689751Z Start cleaning up orphan processes.
2020-03-18T17:00:50.4989428Z Terminate orphan process: pid (3691) (python)
2020-03-18T17:00:50.5031813Z ##[section]Finishing: Finalize Job

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 @rust-lang/infra. (Feature Requests)

bors · 2020-03-18T17:01:17Z

💔 Test failed - checks-azure

gilescope and others added 30 commits February 13, 2020 19:42

keyword docs for else and inkeyword docs for else and in.

a113609

Don't insert panic when generator can not return

425e7e5

Don't insert panic when generator can not unwind

5ac41a1

Poison generators when any terminator unwinds

46aeef6

This didn't cause issues before since generator types were always considered to "need drop", leading to unwind paths (including a `Resume` block) always getting generated.

Change index for SwitchInt case

8d9f633

The indices do not matter here, and this fixes an index out of bounds panic when compiling a generator that can unwind but not return.

Add test for unnecessary panic branches

2cbccce

clean up E0308 explanation

57f1bb1

Update tests

64460a1

Apply suggestions from code review

cb58de8

Co-Authored-By: bjorn3 <bjorn3@users.noreply.github.com>

miri: categorize errors into "unsupported" and "UB"

f5efb68

Also slightly refactor pointer bounds checks to avoid creating unnecessary temporary Errors

fmt, tweak messages and bless

d02543a

generalize InvalidNullPointerUsage to InvalidIntPointerUsage

9a95b01

fmt, and fix rustfmt-induced rebase hickup

3ebcd78

start Miri messages lower-case

2764d3d

explain why we catch PointerUseAfterFree

3e61442

avoid boolean inversion

d8f8168

we are on 2018 edition, use try block

9681422

make error message less confusing

93436d8

fmt

e219dd4

Swap inserts to keep the original ordering

38fa378

remove unnecessary hir::map imports

73a625b

use direct imports for rustc::{lint, session}.

4392a8b

Remove free_region_map from TypeckTables

5a9ccc9

It was unused.

Don't use TypeckTables in NiceRegionError

cefd030

Regions in TypeckTables will be erased, so are unusable for error reporting.

Erase regions in writeback

0a7f16e

Also skip duplicated region solving entirely with `-Zborrowck=mir`.

Update tests for erasing regions in typeck

1ee5829

Don't unwind when hitting the macro expansion recursion limit

3314a34

Update test

bdaf9e4

Make newtype_index methods const

429b16e

Rename from_u32_const -> from_u32

7f5a284

Centril and others added 15 commits March 18, 2020 13:17

defatalize get_test_runner

c440890

defatalize expand_test_or_bench

5a42b65

expand: add recovery for parse_nt

83313e4

expand: address review comments

7d38b0f

Tidy: fix running rustfmt twice

287c4eb

Rollup merge of rust-lang#67749 - gilescope:keyword-in, r=Dylan-DPC

ffa36b8

keyword docs for else and inkeyword docs for else and in. First cut of else and in keyword docs. Comments and suggestions more than welcome.

Rollup merge of rust-lang#69139 - GuillaumeGomez:cleanup-e0308, r=Dyl…

0789d63

…an-DPC clean up E0308 explanation r? @Dylan-DPC

Rollup merge of rust-lang#69497 - Zoxc:ast-fragment-error, r=petroche…

e42a844

…nkov Don't unwind when hitting the macro expansion recursion limit This removes one use of `FatalError.raise()`. r? @petrochenkov

Rollup merge of rust-lang#69899 - ecstatic-morse:const-idx-methods, r…

e10ecf1

…=oli-obk Make methods declared by `newtype_index` macro `const` Crates that use the macro to define an `Idx` type need to enable `#![feature(const_if_match, const_panic)]`.

Rollup merge of rust-lang#70074 - Centril:unpanictry, r=petrochenkov

2dc0837

Expand: nix all fatal errors Basically, we go after all `.span_fatal` / `FatalError.raise()` and similar things and remove them one by one until there are no fatal errors left. r? @petrochenkov

Centril added the rollup A PR which is a rollup label Mar 18, 2020

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 18, 2020

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 18, 2020

Centril mentioned this pull request Mar 18, 2020

Don't unwind when hitting the macro expansion recursion limit #69497

Merged

Centril closed this Mar 18, 2020

Centril deleted the rollup-a5upmk7 branch March 18, 2020 17:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 10 pull requests #70110

Rollup of 10 pull requests #70110

Centril commented Mar 18, 2020

Centril commented Mar 18, 2020

bors commented Mar 18, 2020

bors commented Mar 18, 2020

Centril commented Mar 18, 2020

rust-highfive commented Mar 18, 2020

rust-highfive commented Mar 18, 2020

bors commented Mar 18, 2020

Rollup of 10 pull requests #70110

Rollup of 10 pull requests #70110

Conversation

Centril commented Mar 18, 2020

Centril commented Mar 18, 2020

bors commented Mar 18, 2020

bors commented Mar 18, 2020

Centril commented Mar 18, 2020

rust-highfive commented Mar 18, 2020

rust-highfive commented Mar 18, 2020

bors commented Mar 18, 2020