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

Provide structured suggestion for binding needing type on E0594 #107646

Merged
merged 2 commits into from
Feb 5, 2023
Merged

Provide structured suggestion for binding needing type on E0594 #107646

merged 2 commits into from
Feb 5, 2023

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Feb 3, 2023

Partially address #45405.

@rustbot
Copy link
Collaborator

rustbot commented Feb 3, 2023

r? @WaffleLapkin

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

@rustbot rustbot added 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 Feb 3, 2023
compiler-errors
compiler-errors reviewed Feb 3, 2023
View reviewed changes
compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs Outdated
}
let hir_map = self.infcx.tcx.hir();
let pat = loop {
// Poor man's try block
Copy link
Member

Choose a reason for hiding this comment

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

Can we just use a try block here? This is the compiler after all. Or a closure (|| {})() is typically what I see being used instead.

Copy link
Member

Choose a reason for hiding this comment

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

#![feature(try_blocks)] is already enabled in rustc_borrowck too 😃

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ended up doing let chains instead :)

compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs Outdated Show resolved Hide resolved
compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs Outdated Show resolved Hide resolved
compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs Outdated Show resolved Hide resolved
@compiler-errors
Copy link
Member

r=me after the nits tho

@compiler-errors
Copy link
Member

thanks

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 3, 2023

📌 Commit e6c56cd has been approved by compiler-errors

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 Feb 3, 2023
@bors
Copy link
Contributor

bors commented Feb 4, 2023

⌛ Testing commit e6c56cd with merge 54d8cbff5aaf4aec267f2f9b2c8c1096f15c351e...

@bors
Copy link
Contributor

bors commented Feb 4, 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 Feb 4, 2023
@estebank
Copy link
Contributor Author

estebank commented Feb 4, 2023

@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 Feb 4, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 4, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 4, 2023
@bors
Auto merge of rust-lang#107672 - matthiaskrgr:rollup-7e6dbuk, r=matth…
50d3ba5 
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#107116 (consolidate bootstrap docs)
 - rust-lang#107646 (Provide structured suggestion for binding needing type on E0594)
 - rust-lang#107661 (Remove Esteban from review queues for a while)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d381eca into rust-lang:master Feb 5, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 5, 2023
@rust-log-analyzer
Copy link
Collaborator

The job dist-i686-mingw failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
[2615/3021] Linking CXX static library lib\libLLVMWebAssemblyDesc.a
[2616/3021] Building Options.inc...
[2617/3021] Linking CXX static library lib\libLLVMSystemZCodeGen.a
[2618/3021] Linking CXX static library lib\libLLVMM68kCodeGen.a
FAILED: lib/libLLVMM68kCodeGen.a 
cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E rm -f lib\libLLVMM68kCodeGen.a && D:\a\rust\rust\mingw32\bin\ar.exe qc lib\libLLVMM68kCodeGen.a  lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/GISel/M68kCallLowering.cpp.obj lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/GISel/M68kInstructionSelector.cpp.obj lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/GISel/M68kLegalizerInfo.cpp.obj lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/GISel/M68kRegisterBankInfo.cpp.obj lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/M68kAsmPrinter.cpp.obj lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/M68kCollapseMOVEMPass.cpp.obj lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/M68kExpandPseudo.cpp.obj lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/M68kFrameLowering.cpp.obj lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/M68kInstrInfo.cpp.obj lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/M68kISelLowering.cpp.obj lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/M68kISelDAGToDAG.cpp.obj lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/M68kMachineFunction.cpp.obj lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/M68kMCInstLower.cpp.obj lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/M68kRegisterInfo.cpp.obj lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/M68kSubtarget.cpp.obj lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/M68kTargetMachine.cpp.obj lib/Target/M68k/CMakeFiles/LLVMM68kCodeGen.dir/M68kTargetObjectFile.cpp.obj && D:\a\rust\rust\mingw32\bin\ranlib.exe lib\libLLVMM68kCodeGen.a && cd ."
D:\a\rust\rust\mingw32\bin\ranlib.exe: could not create temporary file whilst writing archive: no more archived files
[2619/3021] Linking CXX static library lib\libLLVMAVRCodeGen.a
[2620/3021] Linking CXX static library lib\libLLVMWebAssemblyDisassembler.a
[2621/3021] Linking CXX static library lib\libLLVMWebAssemblyCodeGen.a
[2622/3021] Linking CXX static library lib\libLLVMX86CodeGen.a
[2622/3021] Linking CXX static library lib\libLLVMX86CodeGen.a
[2623/3021] Building CXX object tools/llc/CMakeFiles/llc.dir/llc.cpp.obj
[2624/3021] Linking CXX executable bin\llvm-profdata.exe
[2625/3021] Linking CXX static library lib\libLLVMPasses.a
ninja: build stopped: subcommand failed.
command did not execute successfully, got: exit code: 1


build script failed, must exit now', C:\Users\runneradmin\.cargo\registry\src\index.crates.io-1cd66030c949c28d\cmake-0.1.48\src\lib.rs:975:5
 finished in 262.035 seconds
Build completed successfully in 0:07:42

@erikdesjardins erikdesjardins mentioned this pull request Feb 19, 2023
Open
@estebank estebank deleted the specific-span branch November 9, 2023 05:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors compiler-errors left review comments

Assignees

@WaffleLapkin WaffleLapkin

Labels
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.69.0
Development

Successfully merging this pull request may close these issues.
6 participants
@estebank @rustbot @compiler-errors @bors @rust-log-analyzer @WaffleLapkin