don't call multipart_suggestion

ouz-a · ouz-a · commit 1853ffccbc0d · 2022-03-12T18:51:28.000+03:00
diff --git a/compiler/rustc_middle/src/ty/diagnostics.rs b/compiler/rustc_middle/src/ty/diagnostics.rs
@@ -325,12 +325,6 @@ pub fn suggest_constraining_type_params<'a>(
             }
         }
 
-        // This check is always run on non-valid code
-        // to not trigger ICE
-        if constraints.is_empty() && suggestions.is_empty() {
-            return false;
-        }
-
         if constraints.is_empty() {
             continue;
         }
@@ -518,7 +512,7 @@ pub fn suggest_constraining_type_params<'a>(
         };
 
         err.span_suggestion_verbose(span, msg, suggestion, applicability);
-    } else {
+    } else if suggestions.len() > 1 {
         err.multipart_suggestion_verbose(
             "consider restricting type parameters",
             suggestions.into_iter().map(|(span, suggestion, _)| (span, suggestion)).collect(),

Original file line number	Diff line number	Diff line change
`@@ -325,12 +325,6 @@ pub fn suggest_constraining_type_params<'a>(`
`325`	`325`	`}`
`326`	`326`	`}`
`327`	`327`
`328`		`- // This check is always run on non-valid code`
`329`		`- // to not trigger ICE`
`330`		`- if constraints.is_empty() && suggestions.is_empty() {`
`331`		`- return false;`
`332`		`- }`
`333`		`-`
`334`	`328`	`if constraints.is_empty() {`
`335`	`329`	`continue;`
`336`	`330`	`}`
`@@ -518,7 +512,7 @@ pub fn suggest_constraining_type_params<'a>(`
`518`	`512`	`};`
`519`	`513`
`520`	`514`	`err.span_suggestion_verbose(span, msg, suggestion, applicability);`
`521`		`- } else {`
	`515`	`+ } else if suggestions.len() > 1 {`
`522`	`516`	`err.multipart_suggestion_verbose(`
`523`	`517`	`"consider restricting type parameters",`
`524`	`518`	`suggestions.into_iter().map(\|(span, suggestion, _)\| (span, suggestion)).collect(),`