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

Correctly display raw identifier in notes and help messages #68963

Closed
wants to merge 4 commits into from

Conversation

olegnn
Copy link
Contributor

@olegnn olegnn commented Feb 8, 2020

@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 Feb 8, 2020
@rust-highfive
Copy link
Collaborator

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-02-08T17:47:02.3386084Z ========================== Starting Command Output ===========================
2020-02-08T17:47:02.3390153Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/3c6e4edb-2b35-4f14-a0d3-c2209bc112f3.sh
2020-02-08T17:47:02.3390480Z 
2020-02-08T17:47:02.3394271Z ##[section]Finishing: Disable git automatic line ending conversion
2020-02-08T17:47:02.3401439Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-08T17:47:02.3403448Z Task         : Get sources
2020-02-08T17:47:02.3403480Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-08T17:47:02.3403508Z Version      : 1.0.0
2020-02-08T17:47:02.3403597Z Author       : Microsoft
---
2020-02-08T17:47:03.3402667Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-02-08T17:47:03.3416371Z ##[command]git config gc.auto 0
2020-02-08T17:47:03.3419942Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-02-08T17:47:03.3422256Z ##[command]git config --get-all http.proxy
2020-02-08T17:47:03.3476612Z ##[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/68963/merge:refs/remotes/pull/68963/merge
---
2020-02-08T17:53:07.9160588Z Found 0 error codes with no tests
2020-02-08T17:53:07.9160848Z Done!
2020-02-08T17:53:07.9165988Z 
2020-02-08T17:53:07.9166068Z 
2020-02-08T17:53:07.9167757Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor"
2020-02-08T17:53:07.9170300Z 
2020-02-08T17:53:07.9170505Z 
2020-02-08T17:53:07.9181746Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2020-02-08T17:53:07.9181834Z Build completed unsuccessfully in 0:01:41
2020-02-08T17:53:07.9181834Z Build completed unsuccessfully in 0:01:41
2020-02-08T17:53:07.9237840Z == clock drift check ==
2020-02-08T17:53:07.9249408Z   local time: Sat Feb  8 17:53:07 UTC 2020
2020-02-08T17:53:08.0852530Z   network time: Sat, 08 Feb 2020 17:53:08 GMT
2020-02-08T17:53:08.0857059Z == end clock drift check ==
2020-02-08T17:53:08.9485658Z 
2020-02-08T17:53:08.9572435Z ##[error]Bash exited with code '1'.
2020-02-08T17:53:08.9585456Z ##[section]Finishing: Run build
2020-02-08T17:53:08.9602056Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-08T17:53:08.9604115Z Task         : Get sources
2020-02-08T17:53:08.9604186Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-08T17:53:08.9604258Z Version      : 1.0.0
2020-02-08T17:53:08.9604306Z Author       : Microsoft
2020-02-08T17:53:08.9604306Z Author       : Microsoft
2020-02-08T17:53:08.9604374Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-02-08T17:53:08.9604430Z ==============================================================================
2020-02-08T17:53:09.3670950Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-02-08T17:53:09.3712776Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-08T17:53:09.3837637Z Cleaning up task key
2020-02-08T17:53:09.3838543Z Start cleaning up orphan processes.
2020-02-08T17:53:09.4000169Z Terminate orphan process: pid (4713) (python)
2020-02-08T17:53:09.4222585Z ##[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 @TimNN. (Feature Requests)

@estebank
Copy link
Contributor

estebank commented Feb 8, 2020

You need to run ./x.py fmt.

r? @estebank
r=me after doing that.

@rust-highfive rust-highfive assigned estebank and unassigned cramertj Feb 8, 2020
@Patryk27
Copy link
Contributor

Patryk27 commented Feb 8, 2020

Out of curiosity: how does this play together with Rust's editions? E.g. in the 2015's edition async is a perfectly fine identifier.

@estebank
Copy link
Contributor

estebank commented Feb 8, 2020

@Patryk27 it will do the right.

@petrochenkov
Copy link
Contributor

@estebank
The with_dummy_span version won't, you need to inherit the span from the original identifier for edition hygiene to work.

@estebank
Copy link
Contributor

estebank commented Feb 9, 2020

@petrochenkov right, forgot about Spans carrying the edition information in them.

@rust-highfive
Copy link
Collaborator

The job mingw-check 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-02-09T14:00:04.3825204Z ========================== Starting Command Output ===========================
2020-02-09T14:00:04.3842645Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/72277fbf-513c-4685-8925-fad5e34dd2c9.sh
2020-02-09T14:00:05.2009631Z 
2020-02-09T14:00:05.2083336Z ##[section]Finishing: Disable git automatic line ending conversion
2020-02-09T14:00:05.2093277Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-09T14:00:05.2095025Z Task         : Get sources
2020-02-09T14:00:05.2095059Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-09T14:00:05.2095089Z Version      : 1.0.0
2020-02-09T14:00:05.2095119Z Author       : Microsoft
---
2020-02-09T14:00:10.8373376Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-02-09T14:00:10.8716872Z ##[command]git config gc.auto 0
2020-02-09T14:00:10.8783031Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-02-09T14:00:10.8832930Z ##[command]git config --get-all http.proxy
2020-02-09T14:00:10.8988152Z ##[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/68963/merge:refs/remotes/pull/68963/merge
---
2020-02-09T14:09:15.4320605Z     Checking rustc_resolve v0.0.0 (/checkout/src/librustc_resolve)
2020-02-09T14:09:16.4944235Z error[E0308]: mismatched types
2020-02-09T14:09:16.4944734Z    --> src/librustc_resolve/diagnostics.rs:825:67
2020-02-09T14:09:16.4944971Z     |
2020-02-09T14:09:16.4945445Z 825 |                 .map(|span| Ident::new(suggestion.candidate.name, span))
2020-02-09T14:09:16.4946340Z     |                                                                   |
2020-02-09T14:09:16.4946851Z     |                                                                   expected struct `rustc_span::span_encoding::Span`, found `&rustc_span::span_encoding::Span`
2020-02-09T14:09:16.4946851Z     |                                                                   expected struct `rustc_span::span_encoding::Span`, found `&rustc_span::span_encoding::Span`
2020-02-09T14:09:16.4947263Z     |                                                                   help: consider dereferencing the borrow: `*span`
2020-02-09T14:09:17.3081474Z error: aborting due to previous error
2020-02-09T14:09:17.3081573Z 
2020-02-09T14:09:17.3089480Z For more information about this error, try `rustc --explain E0308`.
2020-02-09T14:09:17.3147691Z error: could not compile `rustc_resolve`.
2020-02-09T14:09:17.3147691Z error: could not compile `rustc_resolve`.
2020-02-09T14:09:17.3164176Z warning: build failed, waiting for other jobs to finish...
2020-02-09T14:09:26.9514129Z error: build failed
2020-02-09T14:09:26.9540032Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "-Zconfig-profile" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--color" "always" "--features" " llvm" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json-render-diagnostics"
2020-02-09T14:09:26.9550117Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
2020-02-09T14:09:26.9550339Z Build completed unsuccessfully in 0:06:10
2020-02-09T14:09:26.9610606Z == clock drift check ==
2020-02-09T14:09:26.9627842Z   local time: Sun Feb  9 14:09:26 UTC 2020
2020-02-09T14:09:26.9627842Z   local time: Sun Feb  9 14:09:26 UTC 2020
2020-02-09T14:09:27.2514877Z   network time: Sun, 09 Feb 2020 14:09:27 GMT
2020-02-09T14:09:27.2516503Z == end clock drift check ==
2020-02-09T14:09:28.0937194Z 
2020-02-09T14:09:28.1046832Z ##[error]Bash exited with code '1'.
2020-02-09T14:09:28.1059858Z ##[section]Finishing: Run build
2020-02-09T14:09:28.1078174Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-09T14:09:28.1080520Z Task         : Get sources
2020-02-09T14:09:28.1080564Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-09T14:09:28.1080624Z Version      : 1.0.0
2020-02-09T14:09:28.1080664Z Author       : Microsoft
2020-02-09T14:09:28.1080664Z Author       : Microsoft
2020-02-09T14:09:28.1080707Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-02-09T14:09:28.1080769Z ==============================================================================
2020-02-09T14:09:28.5560825Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-02-09T14:09:28.5603472Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-09T14:09:28.5723373Z Cleaning up task key
2020-02-09T14:09:28.5724117Z Start cleaning up orphan processes.
2020-02-09T14:09:28.5828468Z Terminate orphan process: pid (4272) (python)
2020-02-09T14:09:28.6373509Z ##[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 @TimNN. (Feature Requests)

@rust-highfive
Copy link
Collaborator

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-02-09T15:15:45.7241417Z ========================== Starting Command Output ===========================
2020-02-09T15:15:45.7243501Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/eb9742a1-a364-4ea2-90d8-de92a9afb089.sh
2020-02-09T15:15:45.7243537Z 
2020-02-09T15:15:45.7246216Z ##[section]Finishing: Disable git automatic line ending conversion
2020-02-09T15:15:45.7251750Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-09T15:15:45.7253283Z Task         : Get sources
2020-02-09T15:15:45.7253321Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-09T15:15:45.7253351Z Version      : 1.0.0
2020-02-09T15:15:45.7253380Z Author       : Microsoft
---
2020-02-09T15:15:46.5612326Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-02-09T15:15:46.5679733Z ##[command]git config gc.auto 0
2020-02-09T15:15:46.5745925Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-02-09T15:15:46.5798484Z ##[command]git config --get-all http.proxy
2020-02-09T15:15:46.5915495Z ##[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/68963/merge:refs/remotes/pull/68963/merge
---
2020-02-09T16:11:47.6144637Z .................................................................................................... 1700/9622
2020-02-09T16:11:52.6742814Z .................................................................................................... 1800/9622
2020-02-09T16:12:05.5717657Z ............................i....................................................................... 1900/9622
2020-02-09T16:12:13.0847959Z .................................................................................................... 2000/9622
2020-02-09T16:12:27.7302753Z ..................iiiii............................................................................. 2100/9622
2020-02-09T16:12:37.3595288Z .................................................................................................... 2300/9622
2020-02-09T16:12:39.6770522Z .................................................................................................... 2400/9622
2020-02-09T16:12:44.3853892Z .................................................................................................... 2500/9622
2020-02-09T16:13:04.5381663Z .................................................................................................... 2600/9622
---
2020-02-09T16:15:36.2170545Z .....................................................................i...............i.............. 4900/9622
2020-02-09T16:15:43.8273686Z .................................................................................................... 5000/9622
2020-02-09T16:15:51.4785741Z .................................................................................................... 5100/9622
2020-02-09T16:15:55.9103006Z ...........i........................................................................................ 5200/9622
2020-02-09T16:16:06.5065510Z .....................................................................................ii.ii........i. 5300/9622
2020-02-09T16:16:10.1077683Z ..i................................................................................................. 5400/9622
2020-02-09T16:16:22.3096022Z .................................................................................................... 5600/9622
2020-02-09T16:16:30.5724540Z .........................................................................i.......................... 5700/9622
2020-02-09T16:16:37.7246597Z .................................................................................................... 5800/9622
2020-02-09T16:16:44.3166893Z .................................................................................................... 5900/9622
2020-02-09T16:16:44.3166893Z .................................................................................................... 5900/9622
2020-02-09T16:16:54.0684248Z .................................................................ii...i..ii...........i............. 6000/9622
2020-02-09T16:17:15.2294056Z .................................................................................................... 6200/9622
2020-02-09T16:17:23.1773590Z .................................................................................................... 6300/9622
2020-02-09T16:17:23.1773590Z .................................................................................................... 6300/9622
2020-02-09T16:17:30.9054943Z .............................................................................................i..ii.. 6400/9622
2020-02-09T16:17:53.4413728Z .................................................................................................... 6600/9622
2020-02-09T16:18:03.2376109Z ................................................................................i................... 6700/9622
2020-02-09T16:18:05.3523876Z .................................................................................................... 6800/9622
2020-02-09T16:18:07.4823709Z .......................................................................................i............ 6900/9622
---
2020-02-09T16:19:41.7845639Z .................................................................................................... 7600/9622
2020-02-09T16:19:45.7925442Z .................................................................................................... 7700/9622
2020-02-09T16:19:51.4623822Z .................................................................................................... 7800/9622
2020-02-09T16:20:00.2096081Z .................................................................................................... 7900/9622
2020-02-09T16:20:09.7990709Z ...............................................................iiiiiii.i............................ 8000/9622
2020-02-09T16:20:25.3106103Z ...i......i.......................................................................................F. 8200/9622
2020-02-09T16:20:31.1593530Z .................................................................................................... 8300/9622
2020-02-09T16:20:45.3125831Z .................................................................................................... 8400/9622
2020-02-09T16:20:54.5716867Z .................................................................................................... 8500/9622
---
2020-02-09T16:22:58.6360314Z 
2020-02-09T16:22:58.6360356Z 1 error[E0425]: cannot find value `fina` in this scope
2020-02-09T16:22:58.6360583Z 2   --> $DIR/issue-68962.rs:7:5
2020-02-09T16:22:58.6360626Z 3    |
2020-02-09T16:22:58.6360851Z - LL |     fina; //~ ERROR cannot find value
2020-02-09T16:22:58.6360897Z + LL |     fina;
2020-02-09T16:22:58.6360943Z 5    |     ^^^^ help: a local variable with a similar name exists: `r#final`
2020-02-09T16:22:58.6361232Z + 
2020-02-09T16:22:58.6361278Z 7 error[E0425]: cannot find function `f` in this scope
2020-02-09T16:22:58.6361507Z 8   --> $DIR/issue-68962.rs:10:5
2020-02-09T16:22:58.6361553Z 9    |
2020-02-09T16:22:58.6361553Z 9    |
2020-02-09T16:22:58.6361581Z 
2020-02-09T16:22:58.6361623Z 10 LL | fn r#fn() {}
2020-02-09T16:22:58.6361875Z 11    | ------------ similarly named function `r#fn` defined here
2020-02-09T16:22:58.6362208Z - LL |     f(); //~ ERROR cannot find function
2020-02-09T16:22:58.6362274Z + LL |     f();
2020-02-09T16:22:58.6362323Z 14    |     ^ help: a function with a similar name exists: `r#fn`
2020-02-09T16:22:58.6362500Z -  
---
2020-02-09T16:22:58.6362937Z 
2020-02-09T16:22:58.6362972Z 
2020-02-09T16:22:58.6363017Z The actual stderr differed from the expected stderr.
2020-02-09T16:22:58.6363303Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/span/issue-68962/issue-68962.stderr
2020-02-09T16:22:58.6363562Z To update references, rerun the tests and pass the `--bless` flag
2020-02-09T16:22:58.6363811Z To only update this specific test, also pass `--test-args span/issue-68962.rs`
2020-02-09T16:22:58.6363917Z error: 1 errors occurred comparing output.
2020-02-09T16:22:58.6363960Z status: exit code: 1
2020-02-09T16:22:58.6363960Z status: exit code: 1
2020-02-09T16:22:58.6364679Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/span/issue-68962.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/span/issue-68962" "-Crpath" "-O" "-Cdebuginfo=0" "-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/span/issue-68962/auxiliary" "-A" "unused"
2020-02-09T16:22:58.6365013Z ------------------------------------------
2020-02-09T16:22:58.6365065Z 
2020-02-09T16:22:58.6365276Z ------------------------------------------
2020-02-09T16:22:58.6365322Z stderr:
2020-02-09T16:22:58.6365322Z stderr:
2020-02-09T16:22:58.6365732Z ------------------------------------------
2020-02-09T16:22:58.6365797Z error[E0425]: cannot find value `fina` in this scope
2020-02-09T16:22:58.6366059Z   --> /checkout/src/test/ui/span/issue-68962.rs:7:5
2020-02-09T16:22:58.6366106Z    |
2020-02-09T16:22:58.6366169Z LL |     fina; //~ ERROR cannot find value
2020-02-09T16:22:58.6366223Z    |     ^^^^ help: a local variable with a similar name exists: `r#final`
2020-02-09T16:22:58.6366321Z error[E0425]: cannot find function `f` in this scope
2020-02-09T16:22:58.6366701Z   --> /checkout/src/test/ui/span/issue-68962.rs:10:5
2020-02-09T16:22:58.6366748Z    |
2020-02-09T16:22:58.6366748Z    |
2020-02-09T16:22:58.6366807Z LL | fn r#fn() {}
2020-02-09T16:22:58.6367041Z    | ------------ similarly named function `r#fn` defined here
2020-02-09T16:22:58.6367130Z LL |     f(); //~ ERROR cannot find function
2020-02-09T16:22:58.6367195Z    |     ^ help: a function with a similar name exists: `r#fn`
2020-02-09T16:22:58.6367226Z 
2020-02-09T16:22:58.6367276Z error: aborting due to 2 previous errors
---
2020-02-09T16:22:58.6391553Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:348:22
2020-02-09T16:22:58.6391686Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-02-09T16:22:58.6400439Z 
2020-02-09T16:22:58.6400888Z 
2020-02-09T16:22:58.6413040Z 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" "--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-02-09T16:22:58.6414346Z 
2020-02-09T16:22:58.6414395Z 
2020-02-09T16:22:58.6423063Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2020-02-09T16:22:58.6423139Z Build completed unsuccessfully in 1:01:27
2020-02-09T16:22:58.6423139Z Build completed unsuccessfully in 1:01:27
2020-02-09T16:22:58.6484050Z == clock drift check ==
2020-02-09T16:22:58.6507862Z   local time: Sun Feb  9 16:22:58 UTC 2020
2020-02-09T16:22:58.9472233Z   network time: Sun, 09 Feb 2020 16:22:58 GMT
2020-02-09T16:22:58.9477535Z == end clock drift check ==
2020-02-09T16:22:59.3606857Z 
2020-02-09T16:22:59.3701799Z ##[error]Bash exited with code '1'.
2020-02-09T16:22:59.3712931Z ##[section]Finishing: Run build
2020-02-09T16:22:59.3737469Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-09T16:22:59.3739164Z Task         : Get sources
2020-02-09T16:22:59.3739221Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-09T16:22:59.3739264Z Version      : 1.0.0
2020-02-09T16:22:59.3739299Z Author       : Microsoft
2020-02-09T16:22:59.3739299Z Author       : Microsoft
2020-02-09T16:22:59.3739339Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-02-09T16:22:59.3739402Z ==============================================================================
2020-02-09T16:22:59.8045762Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-02-09T16:22:59.8092982Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-09T16:22:59.8202052Z Cleaning up task key
2020-02-09T16:22:59.8202699Z Start cleaning up orphan processes.
2020-02-09T16:22:59.8320357Z Terminate orphan process: pid (3662) (python)
2020-02-09T16:22:59.8583184Z ##[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 @TimNN. (Feature Requests)

@olegnn
Copy link
Contributor Author

olegnn commented Feb 9, 2020

Finally I built it and tested (with --incremental) on my machine, and now it seems to be working. @estebank does it capture spans correctly?

@estebank
Copy link
Contributor

@olegnn this should work nicely! Could you squash your commits? r=me after that.

@bors
Copy link
Contributor

bors commented Feb 10, 2020

@olegnn: 🔑 Insufficient privileges: Not in reviewers

@olegnn
Copy link
Contributor Author

olegnn commented Feb 10, 2020

@estebank it looks like I don’t have permission to use r= but I squashed commits, and CI is green.

@estebank
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 11, 2020

@olegnn: 🔑 Insufficient privileges: Not in reviewers

@petrochenkov
Copy link
Contributor

@bors r-

Let's discuss treating this as wontfix first - #69053 (comment).

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 11, 2020
@olegnn olegnn changed the title Suggest correct raw identifier in case of typo Correctly display raw identifier in notes and help messages Feb 21, 2020
@rust-highfive
Copy link
Collaborator

The job mingw-check 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-02-21T15:05:03.0291131Z ========================== Starting Command Output ===========================
2020-02-21T15:05:03.0296997Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/441531fc-e64f-475c-a7d7-f6a755cebb1b.sh
2020-02-21T15:05:03.0297500Z 
2020-02-21T15:05:03.0301549Z ##[section]Finishing: Disable git automatic line ending conversion
2020-02-21T15:05:03.0324464Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-21T15:05:03.0327822Z Task         : Get sources
2020-02-21T15:05:03.0328121Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-21T15:05:03.0328402Z Version      : 1.0.0
2020-02-21T15:05:03.0328595Z Author       : Microsoft
---
2020-02-21T15:05:04.6684478Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-02-21T15:05:04.6691592Z ##[command]git config gc.auto 0
2020-02-21T15:05:04.6695669Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-02-21T15:05:04.6699425Z ##[command]git config --get-all http.proxy
2020-02-21T15:05:04.6707661Z ##[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/68963/merge:refs/remotes/pull/68963/merge
---
2020-02-21T15:14:26.9959530Z For more information about this error, try `rustc --explain E0412`.
2020-02-21T15:14:27.0007763Z error: could not compile `rustc_infer`.
2020-02-21T15:14:27.0009792Z warning: build failed, waiting for other jobs to finish...
2020-02-21T15:14:28.1091780Z error: build failed
2020-02-21T15:14:28.1122024Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "-Zconfig-profile" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--color" "always" "--features" " llvm" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json-render-diagnostics"
2020-02-21T15:14:28.1136625Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
2020-02-21T15:14:28.1137038Z Build completed unsuccessfully in 0:05:36
2020-02-21T15:14:28.1194909Z == clock drift check ==
2020-02-21T15:14:28.1209900Z   local time: Fri Feb 21 15:14:28 UTC 2020
2020-02-21T15:14:28.1209900Z   local time: Fri Feb 21 15:14:28 UTC 2020
2020-02-21T15:14:28.6647809Z   network time: Fri, 21 Feb 2020 15:14:28 GMT
2020-02-21T15:14:28.6648222Z == end clock drift check ==
2020-02-21T15:14:29.3011115Z 
2020-02-21T15:14:29.3084563Z ##[error]Bash exited with code '1'.
2020-02-21T15:14:29.3099687Z ##[section]Finishing: Run build
2020-02-21T15:14:29.3147094Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-21T15:14:29.3152369Z Task         : Get sources
2020-02-21T15:14:29.3152754Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-21T15:14:29.3153126Z Version      : 1.0.0
2020-02-21T15:14:29.3153372Z Author       : Microsoft
2020-02-21T15:14:29.3153372Z Author       : Microsoft
2020-02-21T15:14:29.3153764Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-02-21T15:14:29.3154235Z ==============================================================================
2020-02-21T15:14:30.3630144Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-02-21T15:14:30.3669772Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-21T15:14:30.3771510Z Cleaning up task key
2020-02-21T15:14:30.3772995Z Start cleaning up orphan processes.
2020-02-21T15:14:30.3981459Z Terminate orphan process: pid (3643) (python)
2020-02-21T15:14:30.4330319Z ##[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 @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Feb 21, 2020

☔ The latest upstream changes (presumably #69342) made this pull request unmergeable. Please resolve the merge conflicts.

@rust-highfive
Copy link
Collaborator

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-02-22T15:02:52.8628321Z ========================== Starting Command Output ===========================
2020-02-22T15:02:52.8647707Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/f5319de8-513c-4bf5-a9f1-f732c4aee6dc.sh
2020-02-22T15:02:52.8839084Z 
2020-02-22T15:02:52.8893504Z ##[section]Finishing: Disable git automatic line ending conversion
2020-02-22T15:02:52.8914065Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-22T15:02:52.8917174Z Task         : Get sources
2020-02-22T15:02:52.8917416Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-22T15:02:52.8917650Z Version      : 1.0.0
2020-02-22T15:02:52.8917853Z Author       : Microsoft
---
2020-02-22T15:02:53.6897410Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-02-22T15:02:53.6903863Z ##[command]git config gc.auto 0
2020-02-22T15:02:53.6906888Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-02-22T15:02:53.6909970Z ##[command]git config --get-all http.proxy
2020-02-22T15:02:53.6915517Z ##[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/68963/merge:refs/remotes/pull/68963/merge
---
2020-02-22T15:08:37.0927637Z Done!
2020-02-22T15:08:37.0930363Z some tidy checks failed
2020-02-22T15:08:37.0933669Z 
2020-02-22T15:08:37.0933811Z 
2020-02-22T15:08:37.0937348Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor"
2020-02-22T15:08:37.0941442Z 
2020-02-22T15:08:37.0941524Z 
2020-02-22T15:08:37.0954071Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2020-02-22T15:08:37.0954552Z Build completed unsuccessfully in 0:01:28
2020-02-22T15:08:37.0954552Z Build completed unsuccessfully in 0:01:28
2020-02-22T15:08:37.0999027Z == clock drift check ==
2020-02-22T15:08:37.1007617Z   local time: Sat Feb 22 15:08:37 UTC 2020
2020-02-22T15:08:37.6225480Z   network time: Sat, 22 Feb 2020 15:08:37 GMT
2020-02-22T15:08:37.6226445Z == end clock drift check ==
2020-02-22T15:08:38.3558780Z 
2020-02-22T15:08:38.3622084Z ##[error]Bash exited with code '1'.
2020-02-22T15:08:38.3642856Z ##[section]Finishing: Run build
2020-02-22T15:08:38.3679804Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-22T15:08:38.3683656Z Task         : Get sources
2020-02-22T15:08:38.3683925Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-22T15:08:38.3684176Z Version      : 1.0.0
2020-02-22T15:08:38.3684339Z Author       : Microsoft
2020-02-22T15:08:38.3684339Z Author       : Microsoft
2020-02-22T15:08:38.3684599Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-02-22T15:08:38.3684917Z ==============================================================================
2020-02-22T15:08:38.6561217Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-02-22T15:08:38.6609245Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-22T15:08:38.6706093Z Cleaning up task key
2020-02-22T15:08:38.6707159Z Start cleaning up orphan processes.
2020-02-22T15:08:38.6875024Z Terminate orphan process: pid (3490) (python)
2020-02-22T15:08:38.7010458Z ##[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 @TimNN. (Feature Requests)

@rust-highfive
Copy link
Collaborator

The job mingw-check 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-02-22T15:20:57.3471605Z ========================== Starting Command Output ===========================
2020-02-22T15:20:57.3474604Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/d88d471e-6ff7-4f82-88f7-7b27cefde95a.sh
2020-02-22T15:20:57.3474828Z 
2020-02-22T15:20:57.3478170Z ##[section]Finishing: Disable git automatic line ending conversion
2020-02-22T15:20:57.3494046Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-22T15:20:57.3496671Z Task         : Get sources
2020-02-22T15:20:57.3496936Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-22T15:20:57.3497145Z Version      : 1.0.0
2020-02-22T15:20:57.3497284Z Author       : Microsoft
---
2020-02-22T15:20:58.6782225Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-02-22T15:20:58.6788391Z ##[command]git config gc.auto 0
2020-02-22T15:20:58.6793834Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-02-22T15:20:58.6799137Z ##[command]git config --get-all http.proxy
2020-02-22T15:20:58.6807239Z ##[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/68963/merge:refs/remotes/pull/68963/merge
---
2020-02-22T15:23:34.6604762Z extracting /checkout/obj/build/cache/2020-01-31/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.gz
2020-02-22T15:23:34.7170013Z error: failed to resolve patches for `https://github.com/rust-lang/cargo`
2020-02-22T15:23:34.7170773Z 
2020-02-22T15:23:34.7170948Z Caused by:
2020-02-22T15:23:34.7171683Z   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
2020-02-22T15:23:34.7178311Z Build completed unsuccessfully in 0:00:11
2020-02-22T15:23:34.7212194Z == clock drift check ==
2020-02-22T15:23:34.7221728Z   local time: Sat Feb 22 15:23:34 UTC 2020
2020-02-22T15:23:34.8791052Z   network time: Sat, 22 Feb 2020 15:23:34 GMT
2020-02-22T15:23:34.8791052Z   network time: Sat, 22 Feb 2020 15:23:34 GMT
2020-02-22T15:23:34.8794918Z == end clock drift check ==
2020-02-22T15:23:42.3849801Z 
2020-02-22T15:23:42.3880980Z ##[error]Bash exited with code '1'.
2020-02-22T15:23:42.3892254Z ##[section]Finishing: Run build
2020-02-22T15:23:42.3925323Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-22T15:23:42.3931825Z Task         : Get sources
2020-02-22T15:23:42.3932274Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-22T15:23:42.3932511Z Version      : 1.0.0
2020-02-22T15:23:42.3932675Z Author       : Microsoft
2020-02-22T15:23:42.3932675Z Author       : Microsoft
2020-02-22T15:23:42.3932956Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-02-22T15:23:42.3933259Z ==============================================================================
2020-02-22T15:23:42.6608364Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-02-22T15:23:42.6639905Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-22T15:23:42.6706216Z Cleaning up task key
2020-02-22T15:23:42.6707208Z Start cleaning up orphan processes.
2020-02-22T15:23:42.6939766Z Terminate orphan process: pid (4174) (python)
2020-02-22T15:23:42.6968067Z ##[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 @TimNN. (Feature Requests)

@olegnn olegnn force-pushed the raw_ident_typo_suggestion branch 2 times, most recently from dbae6df to ba9fe17 Compare February 22, 2020 15:40
@rust-highfive
Copy link
Collaborator

The job mingw-check 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-02-22T15:40:43.3918139Z ========================== Starting Command Output ===========================
2020-02-22T15:40:43.3933364Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/bc43eedf-0b17-4e67-a446-460e074da5ef.sh
2020-02-22T15:40:43.6510595Z 
2020-02-22T15:40:43.6615725Z ##[section]Finishing: Disable git automatic line ending conversion
2020-02-22T15:40:43.6645354Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-22T15:40:43.6722313Z Task         : Get sources
2020-02-22T15:40:43.6724895Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-22T15:40:43.6725325Z Version      : 1.0.0
2020-02-22T15:40:43.6726434Z Author       : Microsoft
---
2020-02-22T15:40:46.2097876Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-02-22T15:40:46.2337803Z ##[command]git config gc.auto 0
2020-02-22T15:40:46.2365841Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-02-22T15:40:46.2400212Z ##[command]git config --get-all http.proxy
2020-02-22T15:40:46.2500845Z ##[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/68963/merge:refs/remotes/pull/68963/merge
---
2020-02-22T15:49:46.2865581Z     Checking rustc_infer v0.0.0 (/checkout/src/librustc_infer)
2020-02-22T15:49:46.7761863Z error[E0433]: failed to resolve: use of undeclared type or module `Symbol`
2020-02-22T15:49:46.7762905Z    --> src/librustc_infer/traits/error_reporting/suggestions.rs:145:33
2020-02-22T15:49:46.7763541Z     |
2020-02-22T15:49:46.7764170Z 145 |                     let param = Symbol::intern(&param_name);
2020-02-22T15:49:46.7765399Z 
2020-02-22T15:49:49.7119569Z error: aborting due to previous error
2020-02-22T15:49:49.7119936Z 
2020-02-22T15:49:49.7140386Z For more information about this error, try `rustc --explain E0433`.
2020-02-22T15:49:49.7140386Z For more information about this error, try `rustc --explain E0433`.
2020-02-22T15:49:49.7166787Z error: could not compile `rustc_infer`.
2020-02-22T15:49:49.7168836Z warning: build failed, waiting for other jobs to finish...
2020-02-22T15:49:49.7612461Z error: build failed
2020-02-22T15:49:49.7635528Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "-Zconfig-profile" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--color" "always" "--features" " llvm" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json-render-diagnostics"
2020-02-22T15:49:49.7649353Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
2020-02-22T15:49:49.7649721Z Build completed unsuccessfully in 0:05:17
2020-02-22T15:49:49.7696655Z == clock drift check ==
2020-02-22T15:49:49.7714117Z   local time: Sat Feb 22 15:49:49 UTC 2020
2020-02-22T15:49:49.7714117Z   local time: Sat Feb 22 15:49:49 UTC 2020
2020-02-22T15:49:49.9349018Z   network time: Sat, 22 Feb 2020 15:49:49 GMT
2020-02-22T15:49:49.9349929Z == end clock drift check ==
2020-02-22T15:49:50.6669736Z 
2020-02-22T15:49:50.6746898Z ##[error]Bash exited with code '1'.
2020-02-22T15:49:50.6761973Z ##[section]Finishing: Run build
2020-02-22T15:49:50.6803461Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-22T15:49:50.6808683Z Task         : Get sources
2020-02-22T15:49:50.6808993Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-22T15:49:50.6809297Z Version      : 1.0.0
2020-02-22T15:49:50.6809493Z Author       : Microsoft
2020-02-22T15:49:50.6809493Z Author       : Microsoft
2020-02-22T15:49:50.6809809Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-02-22T15:49:50.6810202Z ==============================================================================
2020-02-22T15:49:50.9865318Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-02-22T15:49:50.9910398Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-22T15:49:50.9990760Z Cleaning up task key
2020-02-22T15:49:50.9992047Z Start cleaning up orphan processes.
2020-02-22T15:49:51.0171682Z Terminate orphan process: pid (4242) (python)
2020-02-22T15:49:51.0318158Z ##[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 @TimNN. (Feature Requests)

@olegnn olegnn force-pushed the raw_ident_typo_suggestion branch 2 times, most recently from dd2d603 to 4b95464 Compare February 22, 2020 15:56
@rust-highfive
Copy link
Collaborator

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-02-22T15:57:02.4168248Z ========================== Starting Command Output ===========================
2020-02-22T15:57:02.4170374Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/a50a7cad-0fe6-499e-8710-0179aa386d84.sh
2020-02-22T15:57:02.4170584Z 
2020-02-22T15:57:02.4176633Z ##[section]Finishing: Disable git automatic line ending conversion
2020-02-22T15:57:02.4200928Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68963/merge to s
2020-02-22T15:57:02.4205199Z Task         : Get sources
2020-02-22T15:57:02.4205438Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-22T15:57:02.4206178Z Version      : 1.0.0
2020-02-22T15:57:02.4206338Z Author       : Microsoft
---
2020-02-22T15:57:05.6229080Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-02-22T15:57:05.6238398Z ##[command]git config gc.auto 0
2020-02-22T15:57:05.6246012Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-02-22T15:57:05.6250467Z ##[command]git config --get-all http.proxy
2020-02-22T15:57:05.6261041Z ##[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/68963/merge:refs/remotes/pull/68963/merge

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)

@bors
Copy link
Contributor

bors commented Feb 28, 2020

☔ The latest upstream changes (presumably #69534) made this pull request unmergeable. Please resolve the merge conflicts.

@JohnCSimon
Copy link
Member

Ping from triage:
@olegnn can you please address the merge conflicts? Thanks.

@JohnCSimon JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 9, 2020
@JohnTitor
Copy link
Member

@olegnn One nit: we have "no merge policy" here, recommend not including merge commits on PR: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#pull-requests

@JohnTitor JohnTitor added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 11, 2020
@bors
Copy link
Contributor

bors commented Mar 14, 2020

☔ The latest upstream changes (presumably #69076) made this pull request unmergeable. Please resolve the merge conflicts.

@joelpalmer joelpalmer added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 2, 2020
@joelpalmer joelpalmer added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 14, 2020
@joelpalmer
Copy link

HI @olegnn - closing due to inactivity. Please re-open with updated and conflict resolution. Thanks for the PR.

@joelpalmer joelpalmer closed this Apr 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incorrect raw identifier variable name help suggestion
10 participants