diff options
| author | bors <bors@rust-lang.org> | 2022-07-01 11:09:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-01 11:09:35 +0000 |
| commit | ca1e68b3229e710c3948a361ee770d846a88e6da (patch) | |
| tree | cbd0e8977b42bd32f8ab140f36f825a9d8d74ed6 /compiler/rustc_errors | |
| parent | 7e2733bb1dd9afe5fd20370ca4d539d42ac50419 (diff) | |
| parent | 6e918b4a97c8a2cb0923a639d76f840ac63b76c7 (diff) | |
| download | rust-ca1e68b3229e710c3948a361ee770d846a88e6da.tar.gz rust-ca1e68b3229e710c3948a361ee770d846a88e6da.zip | |
Auto merge of #98730 - matthiaskrgr:rollup-2c4d4x5, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #97629 ([core] add `Exclusive` to sync) - #98503 (fix data race in thread::scope) - #98670 (llvm-wrapper: adapt for LLVMConstExtractValue removal) - #98671 (Fix source sidebar bugs) - #98677 (For diagnostic information of Boolean, remind it as use the type: 'bool') - #98684 (add test for 72793) - #98688 (interpret: add From<&MplaceTy> for PlaceTy) - #98695 (use "or pattern") - #98709 (Remove unneeded methods declaration for old web browsers) - #98717 (get rid of tidy 'unnecessarily ignored' warnings) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors')
| -rw-r--r-- | compiler/rustc_errors/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index 78b0892b3bc..9c42f6f26fc 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -1447,7 +1447,7 @@ impl HandlerInner { self.flags.treat_err_as_bug.map(|c| c.get()).unwrap_or(0), ) { (1, 1) => panic!("aborting due to `-Z treat-err-as-bug=1`"), - (0, _) | (1, _) => {} + (0 | 1, _) => {} (count, as_bug) => panic!( "aborting after {} errors due to `-Z treat-err-as-bug={}`", count, as_bug, |