mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase conflict

Browse Source
This commit is contained in:
Michael Goulet 2022-11-05 18:29:47 +00:00
parent e807cb3c41
commit 9568138069
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_errors/src/diagnostic.rs
View File

@ -734,7 +734,7 @@ impl Diagnostic {
&mut self, &mut self,
sp: Span, sp: Span,
msg: impl Into<SubdiagnosticMessage>, msg: impl Into<SubdiagnosticMessage>,
suggestions: impl Iterator<Item = String>, suggestions: impl IntoIterator<Item = String>,
applicability: Applicability, applicability: Applicability,
style: SuggestionStyle, style: SuggestionStyle,
) -> &mut Self { ) -> &mut Self {
@ -768,7 +768,7 @@ impl Diagnostic {
suggestions: impl IntoIterator<Item = Vec<(Span, String)>>, suggestions: impl IntoIterator<Item = Vec<(Span, String)>>,
applicability: Applicability, applicability: Applicability,
) -> &mut Self { ) -> &mut Self {
let suggestions: Vec<_> = suggestions.collect(); let suggestions: Vec<_> = suggestions.into_iter().collect();
debug_assert!( debug_assert!(
!(suggestions !(suggestions
.iter() .iter()