diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-11-14 19:26:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-14 19:26:16 +0100 |
| commit | abda584a5af1b9ffb6c6c9e520ee4b53690bb7b6 (patch) | |
| tree | 04311c4814e8167212461e184b8d5bf4e6094ce2 /compiler/rustc_errors/src | |
| parent | a86bdb4c507f9f9651f7372075eb17009c7da4a6 (diff) | |
| parent | f902b495ba8379b31bf06089ec025b805b587bd7 (diff) | |
| download | rust-abda584a5af1b9ffb6c6c9e520ee4b53690bb7b6.tar.gz rust-abda584a5af1b9ffb6c6c9e520ee4b53690bb7b6.zip | |
Rollup merge of #104229 - compiler-errors:overlap-full-path, r=davidtwco
Don't print full paths in overlap errors We don't print the full path in other diagnostics -- I don't think it particularly helps with the error message. I also delayed the printing until actually needing to render the error message. r? diagnostics
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/lib.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index a8fd1a17a51..170d4341ae7 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -1254,6 +1254,10 @@ impl HandlerInner { } if diagnostic.has_future_breakage() { + // Future breakages aren't emitted if they're Level::Allowed, + // but they still need to be constructed and stashed below, + // so they'll trigger the good-path bug check. + self.suppressed_expected_diag = true; self.future_breakage_diagnostics.push(diagnostic.clone()); } |