diff options
| author | bors <bors@rust-lang.org> | 2022-07-12 00:25:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-12 00:25:45 +0000 |
| commit | b3f4c3119957aa0a250cab08ab586b7a9a680ef1 (patch) | |
| tree | e05cfc3eadb48f6b95e1ab524efb4a701b9bd4ae /compiler/rustc_errors/src | |
| parent | 8a3325496f89373cb1631a944539ff38d0966fe8 (diff) | |
| parent | c05e27776416f211ccf0f163f5e1deddf8fd87b7 (diff) | |
| download | rust-b3f4c3119957aa0a250cab08ab586b7a9a680ef1.tar.gz rust-b3f4c3119957aa0a250cab08ab586b7a9a680ef1.zip | |
Auto merge of #99165 - matthiaskrgr:rollup-rqpelfa, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #97210 (Support `-A`, `-W`, `-D` and `-F` when running `./x.py clippy`) - #99055 (Fix rustdoc help options) - #99075 (Fix duplicated type annotation suggestion) - #99124 (Fix sized check ICE in asm check) - #99142 (fix(doctest): treat fatal parse errors as incomplete attributes) - #99145 (Don't rerun the build script for the compiler each time on non-windows platforms) - #99146 (Do not error during method probe on `Sized` predicates for types that aren't the method receiver) - #99161 (compiletest: trim edition before passing as flag) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/diagnostic.rs | 8 | ||||
| -rw-r--r-- | compiler/rustc_errors/src/diagnostic_builder.rs | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/compiler/rustc_errors/src/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs index 9429ad1a897..da321c45875 100644 --- a/compiler/rustc_errors/src/diagnostic.rs +++ b/compiler/rustc_errors/src/diagnostic.rs @@ -614,6 +614,14 @@ impl Diagnostic { self } + /// Clear any existing suggestions. + pub fn clear_suggestions(&mut self) -> &mut Self { + if let Ok(suggestions) = &mut self.suggestions { + suggestions.clear(); + } + self + } + /// Helper for pushing to `self.suggestions`, if available (not disable). fn push_suggestion(&mut self, suggestion: CodeSuggestion) { if let Ok(suggestions) = &mut self.suggestions { diff --git a/compiler/rustc_errors/src/diagnostic_builder.rs b/compiler/rustc_errors/src/diagnostic_builder.rs index c3341fd68f4..99ac6a3546e 100644 --- a/compiler/rustc_errors/src/diagnostic_builder.rs +++ b/compiler/rustc_errors/src/diagnostic_builder.rs @@ -461,6 +461,7 @@ impl<'a, G: EmissionGuarantee> DiagnosticBuilder<'a, G> { forward!(pub fn set_is_lint(&mut self,) -> &mut Self); forward!(pub fn disable_suggestions(&mut self,) -> &mut Self); + forward!(pub fn clear_suggestions(&mut self,) -> &mut Self); forward!(pub fn multipart_suggestion( &mut self, |