diff options
| author | bors <bors@rust-lang.org> | 2023-03-29 04:23:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-29 04:23:06 +0000 |
| commit | 40cd0310db7f67867b305c28fb87b5b660e77df1 (patch) | |
| tree | 9f0086ae2c2407c7c348c254fef54c0b19ca0c88 /compiler/rustc_codegen_ssa/src | |
| parent | acd27bb5572553a4dc9a2d6f21d9a3a68ff8a233 (diff) | |
| parent | 439c68ceeb4b7337db47bf08955d438f5b8e5804 (diff) | |
| download | rust-40cd0310db7f67867b305c28fb87b5b660e77df1.tar.gz rust-40cd0310db7f67867b305c28fb87b5b660e77df1.zip | |
Auto merge of #109714 - matthiaskrgr:rollup-wipns5h, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #109149 (Improve error message when writer is forgotten in write and writeln macro) - #109367 (Streamline fast rejection) - #109548 (AnnotationColumn struct to fix hard tab column numbers in errors) - #109694 (do not panic on failure to acquire jobserver token) - #109705 (new solver: check for intercrate mode when accessing the cache) - #109708 (Specialization involving RPITITs is broken so ignore the diagnostic differences) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/write.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/write.rs b/compiler/rustc_codegen_ssa/src/back/write.rs index 7ce72d21727..2dda4cd1694 100644 --- a/compiler/rustc_codegen_ssa/src/back/write.rs +++ b/compiler/rustc_codegen_ssa/src/back/write.rs @@ -1452,8 +1452,8 @@ fn start_executing_work<B: ExtraBackendMethods>( Err(e) => { let msg = &format!("failed to acquire jobserver token: {}", e); shared_emitter.fatal(msg); - // Exit the coordinator thread - panic!("{}", msg) + codegen_done = true; + codegen_aborted = true; } } } |
