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.

Sign up for GitHub

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

Jump to bottom

Migrate diagnostics in rustc_borrowck #104055

Merged
merged 2 commits into from
Apr 17, 2023
Merged

Migrate diagnostics in rustc_borrowck #104055

merged 2 commits into from
Apr 17, 2023

Conversation

AndyJado
Copy link
Contributor

@AndyJado AndyJado commented Nov 6, 2022

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

I am crawling, joyfully.

@rustbot
Copy link
Collaborator

rustbot commented Nov 6, 2022

r? @jackh726

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

@rustbot rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 6, 2022
@AndyJado
Copy link
Contributor Author

AndyJado commented Nov 6, 2022

r? @davidtwco

@rustbot rustbot assigned davidtwco and unassigned jackh726 Nov 6, 2022
@AndyJado AndyJado marked this pull request as ready for review November 6, 2022 14:15
@rustbot
Copy link
Collaborator

rustbot commented Nov 6, 2022

rustc_error_messages was changed

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

@fmease
Copy link
Member

fmease commented Nov 6, 2022

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

@compiler-errors compiler-errors changed the title Bck errors Migrate diagnostics in rustc_borrowck Nov 6, 2022
@AndyJado
Copy link
Contributor Author

AndyJado commented Nov 6, 2022

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.

@AndyJado AndyJado marked this pull request as draft November 7, 2022 10:24
@AndyJado AndyJado marked this pull request as ready for review November 8, 2022 12:00
@davidtwco davidtwco mentioned this pull request Nov 8, 2022
Open
84 tasks
@bors

This comment was marked as resolved.

Sign in to view
@AndyJado AndyJado force-pushed the bck_errors branch 2 times, most recently from 7fc677b to f99933c Compare November 18, 2022 12:59
davidtwco
davidtwco requested changes Nov 23, 2022
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

Apologies for taking so long to give this a review.

compiler/rustc_borrowck/src/diagnostics/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_borrowck/src/diagnostics/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs Outdated Show resolved Hide resolved
compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs Outdated Show resolved Hide resolved
compiler/rustc_error_messages/locales/en-US/borrowck.ftl Outdated Show resolved Hide resolved
compiler/rustc_error_messages/locales/en-US/borrowck.ftl Outdated Show resolved Hide resolved
.../ui/closures/2229_closure_analysis/diagnostics/borrowck/borrowck-closures-mut-and-imm.stderr Outdated Show resolved Hide resolved
src/test/ui/closure_context/issue-42065.stderr Outdated Show resolved Hide resolved
@bors

This comment was marked as resolved.

Sign in to view
@AndyJado AndyJado mentioned this pull request Nov 26, 2022
Closed
@bors

This comment was marked as resolved.

Sign in to view
@AndyJado AndyJado force-pushed the bck_errors branch 2 times, most recently from 202e948 to a33f7a8 Compare November 30, 2022 05:26
@apiraino
Copy link
Contributor

apiraino commented Dec 6, 2022

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 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
Copy link
Contributor

bors commented Apr 10, 2023

⌛ Testing commit e5adc1de21bb0ccb27a874c2a46e129dc8f67d6d with merge 1d5efc7ace6b7ead9c0f72d445c55b3b7874f69b...

@bors
Copy link
Contributor

bors commented Apr 10, 2023

💔 Test failed - checks-actions

@bors 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
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@davidtwco
Copy link
Member

Seems spurious..

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 12, 2023
@bors
Copy link
Contributor

bors commented Apr 12, 2023

⌛ Testing commit e5adc1de21bb0ccb27a874c2a46e129dc8f67d6d with merge 31f515e72096e9a2a3d0f98bc8cbf1dbb5ec5913...

@bors
Copy link
Contributor

bors commented Apr 12, 2023

💔 Test failed - checks-actions

@bors 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
Copy link
Contributor Author

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

@rust-log-analyzer
Copy link
Collaborator

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 -------------------------------

@ehuss ehuss mentioned this pull request Apr 14, 2023
Open
@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 17, 2023

📌 Commit bdf0e74 has been approved by davidtwco

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 17, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Apr 17, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 17, 2023
@bors
Auto merge of rust-lang#110458 - matthiaskrgr:rollup-1xcxmgc, r=matth…
31656e7 
…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
@bors bors merged commit 91fe117 into rust-lang:master Apr 17, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@estebank estebank estebank approved these changes

@est31 est31 est31 requested changes

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.71.0
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@AndyJado @rustbot @fmease @bors @apiraino @davidtwco @rust-log-analyzer @estebank @est31 @jackh726