From 1853ffccbc0d48caa4c948f4b9e116e3ab83a58c Mon Sep 17 00:00:00 2001 From: ouz-a Date: Sat, 12 Mar 2022 18:51:28 +0300 Subject: [PATCH] don't call multipart_suggestion --- compiler/rustc_middle/src/ty/diagnostics.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/compiler/rustc_middle/src/ty/diagnostics.rs b/compiler/rustc_middle/src/ty/diagnostics.rs index 19c80ac7f1a..7d950b79cdd 100644 --- 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(),