diff options
| author | Michael Goulet <michael@errs.io> | 2022-11-05 18:29:47 +0000 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2022-11-09 19:42:23 +0000 |
| commit | 9568138069cce7915eb35386f8d9e020adcd599b (patch) | |
| tree | f7d51c2804c54228cb0134cb68a1ddc360d1983e /compiler/rustc_errors/src | |
| parent | e807cb3c41cb27c88e2740eeb7f1f44988073f52 (diff) | |
| download | rust-9568138069cce7915eb35386f8d9e020adcd599b.tar.gz rust-9568138069cce7915eb35386f8d9e020adcd599b.zip | |
rebase conflict
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/diagnostic.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_errors/src/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs index 81e6b8da1d6..e83e10a68c3 100644 --- a/compiler/rustc_errors/src/diagnostic.rs +++ b/compiler/rustc_errors/src/diagnostic.rs @@ -734,7 +734,7 @@ impl Diagnostic { &mut self, sp: Span, msg: impl Into<SubdiagnosticMessage>, - suggestions: impl Iterator<Item = String>, + suggestions: impl IntoIterator<Item = String>, applicability: Applicability, style: SuggestionStyle, ) -> &mut Self { @@ -768,7 +768,7 @@ impl Diagnostic { suggestions: impl IntoIterator<Item = Vec<(Span, String)>>, applicability: Applicability, ) -> &mut Self { - let suggestions: Vec<_> = suggestions.collect(); + let suggestions: Vec<_> = suggestions.into_iter().collect(); debug_assert!( !(suggestions .iter() |