Skip to content

Commit 422aace

Browse files
estebankestebank
committed
Reduce verbosity of error
1 parent a392f1f commit 422aace

File tree

3 files changed

+24
-43
lines changed

3 files changed

+24
-43
lines changed

‎compiler/rustc_trait_selection/src/traits/error_reporting/type_err_ctxt_ext.rs

+21-16
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ pub trait TypeErrCtxtExt<'tcx> {
112112
obligation: &PredicateObligation<'tcx>,
113113
trait_ref: ty::TraitRef<'tcx>,
114114
err: &mut Diagnostic,
115-
);
115+
) -> bool;
116116

117117
fn report_const_param_not_wf(
118118
&self,
@@ -517,8 +517,9 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
517517

518518
let mut err = struct_span_err!(self.tcx.sess, span, E0277, "{}", err_msg);
519519

520+
let mut suggested = false;
520521
if is_try_conversion {
521-
self.try_conversion_context(&obligation, trait_ref.skip_binder(), &mut err);
522+
suggested = self.try_conversion_context(&obligation, trait_ref.skip_binder(), &mut err);
522523
}
523524

524525
if is_try_conversion && let Some(ret_span) = self.return_type_span(&obligation) {
@@ -621,8 +622,7 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
621622

622623
self.suggest_floating_point_literal(&obligation, &mut err, &trait_ref);
623624
self.suggest_dereferencing_index(&obligation, &mut err, trait_predicate);
624-
let mut suggested =
625-
self.suggest_dereferences(&obligation, &mut err, trait_predicate);
625+
suggested |= self.suggest_dereferences(&obligation, &mut err, trait_predicate);
626626
suggested |= self.suggest_fn_call(&obligation, &mut err, trait_predicate);
627627
let impl_candidates = self.find_similar_impl_candidates(trait_predicate);
628628
suggested = if let &[cand] = &impl_candidates[..] {
@@ -1002,7 +1002,7 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
10021002
obligation: &PredicateObligation<'tcx>,
10031003
trait_ref: ty::TraitRef<'tcx>,
10041004
err: &mut Diagnostic,
1005-
) {
1005+
) -> bool {
10061006
let span = obligation.cause.span;
10071007
struct V<'v> {
10081008
search_span: Span,
@@ -1027,22 +1027,22 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
10271027
Some(hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, _, body_id), .. })) => {
10281028
body_id
10291029
}
1030-
_ => return,
1030+
_ => return false,
10311031
};
10321032
let mut v = V { search_span: span, found: None };
10331033
v.visit_body(self.tcx.hir().body(*body_id));
10341034
let Some(expr) = v.found else {
1035-
return;
1035+
return false;
10361036
};
10371037
let Some(typeck) = &self.typeck_results else {
1038-
return;
1038+
return false;
10391039
};
10401040
let Some((ObligationCauseCode::QuestionMark, Some(y))) = obligation.cause.code().parent()
10411041
else {
1042-
return;
1042+
return false;
10431043
};
10441044
if !self.tcx.is_diagnostic_item(sym::FromResidual, y.def_id()) {
1045-
return;
1045+
return false;
10461046
}
10471047
let self_ty = trait_ref.self_ty();
10481048
let found_ty = trait_ref.args.get(1).and_then(|a| a.as_type());
@@ -1067,6 +1067,7 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
10671067
Some(arg.as_type()?)
10681068
};
10691069

1070+
let mut suggested = false;
10701071
let mut chain = vec![];
10711072

10721073
// The following logic is simlar to `point_at_chain`, but that's focused on associated types
@@ -1131,6 +1132,7 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
11311132
)
11321133
.must_apply_modulo_regions()
11331134
{
1135+
suggested = true;
11341136
err.span_suggestion_short(
11351137
stmt.span.with_lo(expr.span.hi()),
11361138
"remove this semicolon",
@@ -1189,17 +1191,20 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
11891191
)
11901192
.must_apply_modulo_regions()
11911193
{
1192-
err.span_label(span, format!("this has type `Result<_, {err_ty}>`"));
1194+
if !suggested {
1195+
err.span_label(span, format!("this has type `Result<_, {err_ty}>`"));
1196+
}
11931197
} else {
11941198
err.span_label(
1195-
span,
1196-
format!(
1197-
"this can't be annotated with `?` because it has type `Result<_, {err_ty}>`",
1198-
),
1199-
);
1199+
span,
1200+
format!(
1201+
"this can't be annotated with `?` because it has type `Result<_, {err_ty}>`",
1202+
),
1203+
);
12001204
}
12011205
prev = Some(err_ty);
12021206
}
1207+
suggested
12031208
}
12041209

12051210
fn report_const_param_not_wf(

‎tests/ui/traits/question-mark-result-err-mismatch.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ fn foo() -> Result<String, String> { //~ NOTE expected `String` because of this
33
let x = test
44
.split_whitespace()
55
.next()
6-
.ok_or_else(|| { //~ NOTE this has type `Result<_, &str>`
6+
.ok_or_else(|| {
77
"Couldn't split the test string"
88
});
99
let one = x
@@ -15,11 +15,9 @@ fn foo() -> Result<String, String> { //~ NOTE expected `String` because of this
1515
//~^ NOTE in this expansion of desugaring of operator `?`
1616
//~| NOTE in this expansion of desugaring of operator `?`
1717
//~| NOTE in this expansion of desugaring of operator `?`
18-
//~| NOTE in this expansion of desugaring of operator `?`
1918
//~| NOTE the trait `From<()>` is not implemented for `String`
2019
//~| NOTE the question mark operation (`?`) implicitly performs a conversion on the error value using the `From` trait
2120
//~| NOTE required for `Result<String, String>` to implement `FromResidual<Result<Infallible, ()>>`
22-
//~| HELP the following other types implement trait `From<T>`:
2321
Ok(one.to_string())
2422
}
2523

@@ -52,11 +50,9 @@ fn baz() -> Result<String, String> { //~ NOTE expected `String` because of this
5250
//~| NOTE in this expansion of desugaring of operator `?`
5351
//~| NOTE in this expansion of desugaring of operator `?`
5452
//~| NOTE in this expansion of desugaring of operator `?`
55-
//~| NOTE in this expansion of desugaring of operator `?`
5653
//~| NOTE the trait `From<()>` is not implemented for `String`
5754
//~| NOTE the question mark operation (`?`) implicitly performs a conversion on the error value using the `From` trait
5855
//~| NOTE required for `Result<String, String>` to implement `FromResidual<Result<Infallible, ()>>`
59-
//~| HELP the following other types implement trait `From<T>`:
6056
Ok(one.to_string())
6157
}
6258

‎tests/ui/traits/question-mark-result-err-mismatch.stderr

+2-22
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ error[E0277]: `?` couldn't convert the error to `String`
44
LL | fn foo() -> Result<String, String> {
55
| ---------------------- expected `String` because of this
66
...
7-
LL | .ok_or_else(|| {
8-
| __________-
9-
LL | | "Couldn't split the test string"
10-
LL | | });
11-
| |__________- this has type `Result<_, &str>`
12-
...
137
LL | .map_err(|e| {
148
| __________-
159
LL | | e;
@@ -20,17 +14,10 @@ LL | .map(|()| "")?;
2014
| ^ the trait `From<()>` is not implemented for `String`
2115
|
2216
= note: the question mark operation (`?`) implicitly performs a conversion on the error value using the `From` trait
23-
= help: the following other types implement trait `From<T>`:
24-
<String as From<char>>
25-
<String as From<Box<str>>>
26-
<String as From<Cow<'a, str>>>
27-
<String as From<&str>>
28-
<String as From<&mut str>>
29-
<String as From<&String>>
3017
= note: required for `Result<String, String>` to implement `FromResidual<Result<Infallible, ()>>`
3118

3219
error[E0277]: `?` couldn't convert the error to `String`
33-
--> $DIR/question-mark-result-err-mismatch.rs:30:25
20+
--> $DIR/question-mark-result-err-mismatch.rs:28:25
3421
|
3522
LL | fn bar() -> Result<(), String> {
3623
| ------------------ expected `String` because of this
@@ -53,7 +40,7 @@ LL | .map_err(|_| ())?;
5340
= note: required for `Result<(), String>` to implement `FromResidual<Result<Infallible, ()>>`
5441

5542
error[E0277]: `?` couldn't convert the error to `String`
56-
--> $DIR/question-mark-result-err-mismatch.rs:50:11
43+
--> $DIR/question-mark-result-err-mismatch.rs:48:11
5744
|
5845
LL | fn baz() -> Result<String, String> {
5946
| ---------------------- expected `String` because of this
@@ -68,13 +55,6 @@ LL | | })?;
6855
| this can't be annotated with `?` because it has type `Result<_, ()>`
6956
|
7057
= note: the question mark operation (`?`) implicitly performs a conversion on the error value using the `From` trait
71-
= help: the following other types implement trait `From<T>`:
72-
<String as From<char>>
73-
<String as From<Box<str>>>
74-
<String as From<Cow<'a, str>>>
75-
<String as From<&str>>
76-
<String as From<&mut str>>
77-
<String as From<&String>>
7858
= note: required for `Result<String, String>` to implement `FromResidual<Result<Infallible, ()>>`
7959

8060
error: aborting due to 3 previous errors

0 commit comments

Comments
 (0)