Skip to content

Commit fc92ae3

Browse files
compiler-errorscompiler-errors
committed
Add print_trait_sugared
1 parent 4fd68eb commit fc92ae3

File tree

18 files changed

+94
-59
lines changed

18 files changed

+94
-59
lines changed

‎compiler/rustc_hir_analysis/src/astconv/mod.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,10 +1181,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
11811181
if let Some(bound_span) = bound_span {
11821182
err.span_label(
11831183
bound_span,
1184-
format!(
1185-
"ambiguous `{assoc_name}` from `{}`",
1186-
bound.print_only_trait_path(),
1187-
),
1184+
format!("ambiguous `{assoc_name}` from `{}`", bound.print_trait_sugared(),),
11881185
);
11891186
if let Some(constraint) = &is_equality {
11901187
where_bounds.push(format!(

‎compiler/rustc_hir_analysis/src/astconv/object_safety.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
106106
trait here instead: `trait NewTrait: {} {{}}`",
107107
regular_traits
108108
.iter()
109+
// FIXME: This should `print_sugared`, but also needs to integrate projection bounds...
109110
.map(|t| t.trait_ref().print_only_trait_path().to_string())
110111
.collect::<Vec<_>>()
111112
.join(" + "),

‎compiler/rustc_hir_typeck/src/method/suggest.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2288,7 +2288,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
22882288
ty::Adt(def, _) if def.did().is_local() => {
22892289
spans.push_span_label(
22902290
self.tcx.def_span(def.did()),
2291-
format!("must implement `{}`", pred.trait_ref.print_only_trait_path()),
2291+
format!("must implement `{}`", pred.trait_ref.print_trait_sugared()),
22922292
);
22932293
}
22942294
_ => {}

‎compiler/rustc_infer/src/infer/error_reporting/mod.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2221,8 +2221,8 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
22212221
infer::ExistentialProjection(exp_found) => self.expected_found_str(exp_found),
22222222
infer::TraitRefs(exp_found) => {
22232223
let pretty_exp_found = ty::error::ExpectedFound {
2224-
expected: exp_found.expected.print_only_trait_path(),
2225-
found: exp_found.found.print_only_trait_path(),
2224+
expected: exp_found.expected.print_trait_sugared(),
2225+
found: exp_found.found.print_trait_sugared(),
22262226
};
22272227
match self.expected_found_str(pretty_exp_found) {
22282228
Some((expected, found, _, _)) if expected == found => {
@@ -2233,8 +2233,8 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
22332233
}
22342234
infer::PolyTraitRefs(exp_found) => {
22352235
let pretty_exp_found = ty::error::ExpectedFound {
2236-
expected: exp_found.expected.print_only_trait_path(),
2237-
found: exp_found.found.print_only_trait_path(),
2236+
expected: exp_found.expected.print_trait_sugared(),
2237+
found: exp_found.found.print_trait_sugared(),
22382238
};
22392239
match self.expected_found_str(pretty_exp_found) {
22402240
Some((expected, found, _, _)) if expected == found => {

‎compiler/rustc_middle/src/ty/print/pretty.rs‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2637,6 +2637,23 @@ impl<'tcx> fmt::Debug for TraitRefPrintOnlyTraitPath<'tcx> {
26372637
}
26382638
}
26392639

2640+
/// Wrapper type for `ty::TraitRef` which opts-in to pretty printing only
2641+
/// the trait path, and additionally tries to "sugar" `Fn(...)` trait bounds.
2642+
#[derive(Copy, Clone, TypeFoldable, TypeVisitable, Lift)]
2643+
pub struct TraitRefPrintSugared<'tcx>(ty::TraitRef<'tcx>);
2644+
2645+
impl<'tcx> rustc_errors::IntoDiagnosticArg for TraitRefPrintSugared<'tcx> {
2646+
fn into_diagnostic_arg(self) -> rustc_errors::DiagnosticArgValue<'static> {
2647+
self.to_string().into_diagnostic_arg()
2648+
}
2649+
}
2650+
2651+
impl<'tcx> fmt::Debug for TraitRefPrintSugared<'tcx> {
2652+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
2653+
fmt::Display::fmt(self, f)
2654+
}
2655+
}
2656+
26402657
/// Wrapper type for `ty::TraitRef` which opts-in to pretty printing only
26412658
/// the trait name. That is, it will print `Trait` instead of
26422659
/// `<T as Trait<U>>`.
@@ -2654,6 +2671,10 @@ impl<'tcx> ty::TraitRef<'tcx> {
26542671
TraitRefPrintOnlyTraitPath(self)
26552672
}
26562673

2674+
pub fn print_trait_sugared(self) -> TraitRefPrintSugared<'tcx> {
2675+
TraitRefPrintSugared(self)
2676+
}
2677+
26572678
pub fn print_only_trait_name(self) -> TraitRefPrintOnlyTraitName<'tcx> {
26582679
TraitRefPrintOnlyTraitName(self)
26592680
}
@@ -2663,6 +2684,10 @@ impl<'tcx> ty::Binder<'tcx, ty::TraitRef<'tcx>> {
26632684
pub fn print_only_trait_path(self) -> ty::Binder<'tcx, TraitRefPrintOnlyTraitPath<'tcx>> {
26642685
self.map_bound(|tr| tr.print_only_trait_path())
26652686
}
2687+
2688+
pub fn print_trait_sugared(self) -> ty::Binder<'tcx, TraitRefPrintSugared<'tcx>> {
2689+
self.map_bound(|tr| tr.print_trait_sugared())
2690+
}
26662691
}
26672692

26682693
#[derive(Copy, Clone, TypeFoldable, TypeVisitable, Lift)]
@@ -2742,6 +2767,7 @@ forward_display_to_print! {
27422767
ty::PolyExistentialTraitRef<'tcx>,
27432768
ty::Binder<'tcx, ty::TraitRef<'tcx>>,
27442769
ty::Binder<'tcx, TraitRefPrintOnlyTraitPath<'tcx>>,
2770+
ty::Binder<'tcx, TraitRefPrintSugared<'tcx>>,
27452771
ty::Binder<'tcx, ty::FnSig<'tcx>>,
27462772
ty::Binder<'tcx, ty::TraitPredicate<'tcx>>,
27472773
ty::Binder<'tcx, TraitPredPrintModifiersAndPath<'tcx>>,
@@ -2841,6 +2867,24 @@ define_print_and_forward_display! {
28412867
p!(print_def_path(self.0.def_id, self.0.args));
28422868
}
28432869

2870+
TraitRefPrintSugared<'tcx> {
2871+
if !with_no_queries()
2872+
&& let Some(kind) = cx.tcx().fn_trait_kind_from_def_id(self.0.def_id)
2873+
&& let ty::Tuple(args) = self.0.args.type_at(1).kind()
2874+
{
2875+
p!(write("{}", kind.as_str()), "(");
2876+
for (i, arg) in args.iter().enumerate() {
2877+
if i > 0 {
2878+
p!(", ");
2879+
}
2880+
p!(print(arg));
2881+
}
2882+
p!(")");
2883+
} else {
2884+
p!(print_def_path(self.0.def_id, self.0.args));
2885+
}
2886+
}
2887+
28442888
TraitRefPrintOnlyTraitName<'tcx> {
28452889
p!(print_def_path(self.0.def_id, &[]));
28462890
}
@@ -2889,7 +2933,7 @@ define_print_and_forward_display! {
28892933
if let ty::ImplPolarity::Negative = self.polarity {
28902934
p!("!");
28912935
}
2892-
p!(print(self.trait_ref.print_only_trait_path()))
2936+
p!(print(self.trait_ref.print_trait_sugared()))
28932937
}
28942938

28952939
ty::ProjectionPredicate<'tcx> {

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,7 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
184184
flags.push((sym::cause, Some("MainFunctionType".to_string())));
185185
}
186186

187-
if let Some(kind) = self.tcx.fn_trait_kind_from_def_id(trait_ref.def_id)
188-
&& let ty::Tuple(args) = trait_ref.args.type_at(1).kind()
189-
{
190-
let args = args.iter().map(|ty| ty.to_string()).collect::<Vec<_>>().join(", ");
191-
flags.push((sym::Trait, Some(format!("{}({args})", kind.as_str()))));
192-
} else {
193-
flags.push((sym::Trait, Some(trait_ref.print_only_trait_path().to_string())));
194-
}
187+
flags.push((sym::Trait, Some(trait_ref.print_trait_sugared().to_string())));
195188

196189
// Add all types without trimmed paths or visible paths, ensuring they end up with
197190
// their "canonical" def path.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
622622
span.shrink_to_hi(),
623623
format!(
624624
"the trait `{}` is implemented for fn pointer `{}`, try casting using `as`",
625-
cand.print_only_trait_path(),
625+
cand.print_trait_sugared(),
626626
cand.self_ty(),
627627
),
628628
format!(" as {}", cand.self_ty()),
@@ -1786,7 +1786,7 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
17861786
ct_op: |ct| ct.normalize(self.tcx, ty::ParamEnv::empty()),
17871787
});
17881788
err.highlighted_help(vec![
1789-
(format!("the trait `{}` ", cand.print_only_trait_path()), Style::NoStyle),
1789+
(format!("the trait `{}` ", cand.print_trait_sugared()), Style::NoStyle),
17901790
("is".to_string(), Style::Highlight),
17911791
(" implemented for `".to_string(), Style::NoStyle),
17921792
(cand.self_ty().to_string(), Style::Highlight),
@@ -1822,7 +1822,7 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
18221822
_ => (" implemented for `", ""),
18231823
};
18241824
err.highlighted_help(vec![
1825-
(format!("the trait `{}` ", cand.print_only_trait_path()), Style::NoStyle),
1825+
(format!("the trait `{}` ", cand.print_trait_sugared()), Style::NoStyle),
18261826
("is".to_string(), Style::Highlight),
18271827
(desc.to_string(), Style::NoStyle),
18281828
(cand.self_ty().to_string(), Style::Highlight),

‎src/tools/clippy/clippy_lints/src/future_not_send.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ impl<'tcx> LateLintPass<'tcx> for FutureNotSend {
9999
db.note(format!(
100100
"`{}` doesn't implement `{}`",
101101
trait_pred.self_ty(),
102-
trait_pred.trait_ref.print_only_trait_path(),
102+
trait_pred.trait_ref.print_trait_sugared(),
103103
));
104104
}
105105
}

‎tests/ui/error-codes/E0401.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ error[E0283]: type annotations needed
5555
LL | bfnr(x);
5656
| ^^^^ cannot infer type of the type parameter `W` declared on the function `bfnr`
5757
|
58-
= note: multiple `impl`s satisfying `_: Fn<()>` found in the following crates: `alloc`, `core`:
58+
= note: multiple `impl`s satisfying `_: Fn()` found in the following crates: `alloc`, `core`:
5959
- impl<A, F> Fn<A> for &F
6060
where A: Tuple, F: Fn<A>, F: ?Sized;
6161
- impl<Args, F, A> Fn<Args> for Box<F, A>

‎tests/ui/higher-ranked/trait-bounds/normalize-under-binder/issue-71955.stderr‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ error[E0308]: mismatched types
44
LL | foo(bar, "string", |s| s.len() == 5);
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ one type is more general than the other
66
|
7-
= note: expected trait `for<'a, 'b> FnOnce<(&'a &'b str,)>`
8-
found trait `for<'a> FnOnce<(&'a &str,)>`
7+
= note: expected trait `for<'a, 'b> FnOnce(&'a &'b str)`
8+
found trait `for<'a> FnOnce(&'a &str)`
99
note: this closure does not fulfill the lifetime requirements
1010
--> $DIR/issue-71955.rs:45:24
1111
|
@@ -23,8 +23,8 @@ error[E0308]: mismatched types
2323
LL | foo(bar, "string", |s| s.len() == 5);
2424
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ one type is more general than the other
2525
|
26-
= note: expected trait `for<'a, 'b> FnOnce<(&'a &'b str,)>`
27-
found trait `for<'a> FnOnce<(&'a &str,)>`
26+
= note: expected trait `for<'a, 'b> FnOnce(&'a &'b str)`
27+
found trait `for<'a> FnOnce(&'a &str)`
2828
note: this closure does not fulfill the lifetime requirements
2929
--> $DIR/issue-71955.rs:45:24
3030
|
@@ -42,8 +42,8 @@ error[E0308]: mismatched types
4242
LL | foo(baz, "string", |s| s.0.len() == 5);
4343
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ one type is more general than the other
4444
|
45-
= note: expected trait `for<'a, 'b> FnOnce<(&'a Wrapper<'b>,)>`
46-
found trait `for<'a> FnOnce<(&'a Wrapper<'_>,)>`
45+
= note: expected trait `for<'a, 'b> FnOnce(&'a Wrapper<'b>)`
46+
found trait `for<'a> FnOnce(&'a Wrapper<'_>)`
4747
note: this closure does not fulfill the lifetime requirements
4848
--> $DIR/issue-71955.rs:48:24
4949
|
@@ -61,8 +61,8 @@ error[E0308]: mismatched types
6161
LL | foo(baz, "string", |s| s.0.len() == 5);
6262
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ one type is more general than the other
6363
|
64-
= note: expected trait `for<'a, 'b> FnOnce<(&'a Wrapper<'b>,)>`
65-
found trait `for<'a> FnOnce<(&'a Wrapper<'_>,)>`
64+
= note: expected trait `for<'a, 'b> FnOnce(&'a Wrapper<'b>)`
65+
found trait `for<'a> FnOnce(&'a Wrapper<'_>)`
6666
note: this closure does not fulfill the lifetime requirements
6767
--> $DIR/issue-71955.rs:48:24
6868
|

0 commit comments

Comments
 (0)