Migrate diagnostics in `rustc_borrowck` by AndyJado · Pull Request #104055 · rust-lang/rust

AndyJado · 2022-11-06T13:03:32Z

sorry for making a new PR, #103559 and #103960.

I am crawling, joyfully.

rustbot · 2022-11-06T13:03:40Z

r? @jackh726

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

AndyJado · 2022-11-06T13:04:21Z

r? @davidtwco

rustbot · 2022-11-06T14:15:57Z

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki

fmease · 2022-11-06T16:11:55Z

Could you please rename your PR to something more descriptive? I have a hard time understanding what it means. Thanks :)

AndyJado · 2022-11-06T17:23:23Z

thank you Michael for helping out🙇

@fmease ,I'm sorry for the trouble caused, I'll keep that in mind. Here is a description of this PR:

It's one big nested diagnose to me,
I decided to make seperate PR so I could work on isolated problem and get some early advice.
now I think I figured it all out and I can do it correctly in one branch.

.../ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-closures-mut-and-imm.stderr

davidtwco

Apologies for taking so long to give this a review.

compiler/rustc_borrowck/src/diagnostics/mod.rs

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

compiler/rustc_error_messages/locales/en-US/borrowck.ftl

.../ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-closures-mut-and-imm.stderr

src/test/ui/closure_context/issue-42065.stderr

apiraino · 2022-12-06T14:38:07Z

By looking at the recent changes, I think this could be still work in progress. @AndyJado feel free to request a review with @rustbot ready, thanks!

@rustbot author

bors · 2023-04-10T19:14:12Z

⌛ Testing commit e5adc1de21bb0ccb27a874c2a46e129dc8f67d6d with merge 1d5efc7ace6b7ead9c0f72d445c55b3b7874f69b...

bors · 2023-04-10T19:38:44Z

💔 Test failed - checks-actions

davidtwco · 2023-04-12T12:45:27Z

Seems spurious..

@bors retry

bors · 2023-04-12T14:28:34Z

⌛ Testing commit e5adc1de21bb0ccb27a874c2a46e129dc8f67d6d with merge 31f515e72096e9a2a3d0f98bc8cbf1dbb5ec5913...

bors · 2023-04-12T15:03:51Z

💔 Test failed - checks-actions

AndyJado · 2023-04-13T02:35:39Z

umbrella warning is not showing, but merge conflict occurs locally, I rebased and tested and pushed.

rust-log-analyzer · 2023-04-13T04:34:18Z

The job x86_64-gnu-stable failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

---- [run-make] tests/run-make/jobserver-error stdout ----

error: make failed
status: exit status: 2
command: cd "/checkout/tests/run-make/jobserver-error" && AR="ar" CC="cc -ffunction-sections -fdata-sections -fPIC -m64" CXX="c++ -ffunction-sections -fdata-sections -fPIC -m64" HOST_RPATH_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" LD_LIB_PATH_ENVVAR="LD_LIBRARY_PATH" LLVM_BIN_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm/bin" LLVM_COMPONENTS="aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfologicalview debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker dwarflinkerparallel dwp engine executionengine extensions filecheck frontendhlsl frontendopenacc frontendopenmp fuzzercli fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interfacestub interpreter ipo irprinter irreader jitlink libdriver lineeditor linker loongarch loongarchasmparser loongarchcodegen loongarchdesc loongarchdisassembler loongarchinfo lto m68k m68kasmparser m68kcodegen m68kdesc m68kdisassembler m68kinfo mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts objcopy object objectyaml option orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvtargetmca runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target targetparser textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsdriver windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86targetmca xray" LLVM_FILECHECK="/checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm/bin/FileCheck" PYTHON="/usr/bin/python3" RUSTC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" RUSTDOC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" RUST_BUILD_STAGE="stage2-x86_64-unknown-linux-gnu" RUST_DEMANGLER="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/rust-demangler" S="/checkout" TARGET="x86_64-unknown-linux-gnu" TARGET_RPATH_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" TMPDIR="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/jobserver-error/jobserver-error" "make"
--- stdout -------------------------------
bash -c 'echo "fn main() {}" | MAKEFLAGS="--jobserver-auth=3,3" LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/jobserver-error/jobserver-error:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/jobserver-error/jobserver-error -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/jobserver-error/jobserver-error  - 3</dev/null' 2>&1 | diff jobserver.stderr -
1,4d0
< error: failed to acquire jobserver token: early EOF on jobserver pipe
< error: aborting due to previous error
<
------------------------------------------
--- stderr -------------------------------

davidtwco · 2023-04-17T10:29:26Z

@bors r+

bors · 2023-04-17T10:29:28Z

📌 Commit bdf0e74 has been approved by davidtwco

It is now in the queue for this repository.

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#104055 (Migrate diagnostics in `rustc_borrowck`) - rust-lang#110257 (fix false positives for `unused_parens` around unary and binary operations) - rust-lang#110313 (allow `repr(align = x)` on inherent methods) - rust-lang#110337 (Correct default value for default-linker-libraries) - rust-lang#110386 (Clean up traversal macros) - rust-lang#110394 (Various minor Idx-related tweaks) - rust-lang#110425 (Encode def span for `ConstParam`) - rust-lang#110434 (Check freeze with right param-env in `deduced_param_attrs`) - rust-lang#110455 (tests: adapt for LLVM change 5b386b8) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned jackh726 Nov 6, 2022

rustbot assigned davidtwco and unassigned jackh726 Nov 6, 2022

AndyJado marked this pull request as ready for review November 6, 2022 14:15

compiler-errors changed the title ~~Bck errors~~ Migrate diagnostics in rustc_borrowck Nov 6, 2022

AndyJado force-pushed the bck_errors branch from 5eb29da to e99b527 Compare November 7, 2022 10:24

AndyJado marked this pull request as draft November 7, 2022 10:24

AndyJado force-pushed the bck_errors branch from e99b527 to a9284d6 Compare November 7, 2022 12:49

AndyJado commented Nov 8, 2022

View reviewed changes

.../ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-closures-mut-and-imm.stderr Outdated Show resolved Hide resolved

AndyJado marked this pull request as ready for review November 8, 2022 12:00

davidtwco mentioned this pull request Nov 8, 2022

Diagnostic Translation #100717

Open

84 tasks

This comment was marked as resolved.

Sign in to view

AndyJado force-pushed the bck_errors branch 2 times, most recently from 7fc677b to f99933c Compare November 18, 2022 12:59

davidtwco requested changes Nov 23, 2022

View reviewed changes

This comment was marked as resolved.

Sign in to view

AndyJado force-pushed the bck_errors branch from f99933c to 94cb442 Compare November 25, 2022 11:35

AndyJado mentioned this pull request Nov 26, 2022

[WIP] borrowck diagnostic migration with eager booted #104941

Closed

This comment was marked as resolved.

Sign in to view

AndyJado force-pushed the bck_errors branch 2 times, most recently from 202e948 to a33f7a8 Compare November 30, 2022 05:26

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 10, 2023

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 Apr 10, 2023

This comment has been minimized.

Sign in to view

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 12, 2023

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 Apr 12, 2023

AndyJado added 2 commits April 13, 2023 09:43

rm var_span_label to var_subdiag & eager subdiag

d0468a2

migrate ftl msg accroding to rust-lang#103042

bdf0e74

AndyJado force-pushed the bck_errors branch from e5adc1d to bdf0e74 Compare April 13, 2023 01:51

ehuss mentioned this pull request Apr 14, 2023

Spurious CI failure: tests/run-make/jobserver-error #110321

Open

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 17, 2023

matthiaskrgr mentioned this pull request Apr 17, 2023

Rollup of 9 pull requests #110458

Merged

bors merged commit 91fe117 into rust-lang:master Apr 17, 2023

rustbot added this to the 1.71.0 milestone Apr 17, 2023

Uh oh!

Conversation

AndyJado commented Nov 6, 2022

Uh oh!

rustbot commented Nov 6, 2022

Uh oh!

AndyJado commented Nov 6, 2022

Uh oh!

rustbot commented Nov 6, 2022

Uh oh!

fmease commented Nov 6, 2022

Uh oh!

AndyJado commented Nov 6, 2022

Uh oh!

Uh oh!

This comment was marked as resolved.

davidtwco left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

apiraino commented Dec 6, 2022

Uh oh!

bors commented Apr 10, 2023

Uh oh!

bors commented Apr 10, 2023

Uh oh!

This comment has been minimized.

davidtwco commented Apr 12, 2023

Uh oh!

bors commented Apr 12, 2023

Uh oh!

bors commented Apr 12, 2023

Uh oh!

AndyJado commented Apr 13, 2023

Uh oh!

rust-log-analyzer commented Apr 13, 2023

Uh oh!

davidtwco commented Apr 17, 2023

Uh oh!

bors commented Apr 17, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants