diff options
| author | Fabian Wolff <fabi.wolff@arcor.de> | 2021-05-10 14:59:54 +0200 |
|---|---|---|
| committer | Fabian Wolff <fabi.wolff@arcor.de> | 2021-05-10 15:02:15 +0200 |
| commit | 2448c7698ef186ead88bd7980f2cac28c55111a8 (patch) | |
| tree | 02b928a543aaab1a27635b9147e5d9575aa26668 | |
| parent | 3c0c3874fc75c730efba0702579bfeef34eecf31 (diff) | |
More minor fixes suggested by @jackh726
| -rw-r--r-- | compiler/rustc_errors/src/diagnostic.rs | 18 | ||||
| -rw-r--r-- | compiler/rustc_resolve/src/late/diagnostics.rs | 6 | ||||
| -rw-r--r-- | src/test/ui/suggestions/return-elided-lifetime.rs (renamed from src/test/ui/return-elided-lifetime.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/suggestions/return-elided-lifetime.stderr (renamed from src/test/ui/return-elided-lifetime.stderr) | 0 |
4 files changed, 9 insertions, 15 deletions
diff --git a/compiler/rustc_errors/src/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs index 405dd2e68c6..14ccced2c6a 100644 --- a/compiler/rustc_errors/src/diagnostic.rs +++ b/compiler/rustc_errors/src/diagnostic.rs @@ -283,20 +283,12 @@ impl Diagnostic { suggestion: Vec<(Span, String)>, applicability: Applicability, ) -> &mut Self { - assert!(!suggestion.is_empty()); - self.suggestions.push(CodeSuggestion { - substitutions: vec![Substitution { - parts: suggestion - .into_iter() - .map(|(span, snippet)| SubstitutionPart { snippet, span }) - .collect(), - }], - msg: msg.to_owned(), - style: SuggestionStyle::ShowCode, + self.multipart_suggestion_with_style( + msg, + suggestion, applicability, - tool_metadata: Default::default(), - }); - self + SuggestionStyle::ShowCode, + ) } /// [`Diagnostic::multipart_suggestion()`] but you can set the [`SuggestionStyle`]. diff --git a/compiler/rustc_resolve/src/late/diagnostics.rs b/compiler/rustc_resolve/src/late/diagnostics.rs index 9b82d8afd2b..fdde687d486 100644 --- a/compiler/rustc_resolve/src/late/diagnostics.rs +++ b/compiler/rustc_resolve/src/late/diagnostics.rs @@ -1905,9 +1905,11 @@ impl<'tcx> LifetimeContext<'_, 'tcx> { let spans_suggs: Vec<_> = formatters .into_iter() - .filter_map(|fmt| fmt) .zip(spans_with_counts.iter()) - .map(|(formatter, (span, _))| (*span, formatter(name))) + .filter_map(|(fmt, (span, _))| { + if let Some(formatter) = fmt { Some((formatter, span)) } else { None } + }) + .map(|(formatter, span)| (*span, formatter(name))) .collect(); err.multipart_suggestion_with_style( &format!( diff --git a/src/test/ui/return-elided-lifetime.rs b/src/test/ui/suggestions/return-elided-lifetime.rs index ca336bbb056..ca336bbb056 100644 --- a/src/test/ui/return-elided-lifetime.rs +++ b/src/test/ui/suggestions/return-elided-lifetime.rs diff --git a/src/test/ui/return-elided-lifetime.stderr b/src/test/ui/suggestions/return-elided-lifetime.stderr index 888cd5e58ab..888cd5e58ab 100644 --- a/src/test/ui/return-elided-lifetime.stderr +++ b/src/test/ui/suggestions/return-elided-lifetime.stderr |