Skip to content

Commit b57ddfe

Browse files
Print RPITIT like an opaque
1 parent 1feef44 commit b57ddfe

File tree

5 files changed

+18
-14
lines changed

5 files changed

+18
-14
lines changed

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

+12-8
Original file line numberDiff line numberDiff line change
@@ -715,13 +715,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
715715
p!(print_def_path(def_id, &[]));
716716
}
717717
ty::Alias(ty::Projection | ty::Inherent | ty::Weak, ref data) => {
718-
if !(self.should_print_verbose() || with_no_queries())
719-
&& self.tcx().is_impl_trait_in_trait(data.def_id)
720-
{
721-
return self.pretty_print_opaque_impl_type(data.def_id, data.args);
722-
} else {
723-
p!(print(data))
724-
}
718+
p!(print(data))
725719
}
726720
ty::Placeholder(placeholder) => match placeholder.bound.kind {
727721
ty::BoundTyKind::Anon => p!(write("{placeholder:?}")),
@@ -3053,7 +3047,17 @@ define_print_and_forward_display! {
30533047
if let DefKind::Impl { of_trait: false } = cx.tcx().def_kind(cx.tcx().parent(self.def_id)) {
30543048
p!(pretty_print_inherent_projection(self))
30553049
} else {
3056-
p!(print_def_path(self.def_id, self.args));
3050+
// If we're printing verbosely, or don't want to invoke queries
3051+
// (`is_impl_trait_in_trait`), then fall back to printing the def path.
3052+
// This is likely what you want if you're debugging the compiler anyways.
3053+
if !(cx.should_print_verbose() || with_no_queries())
3054+
&& cx.tcx().is_impl_trait_in_trait(self.def_id)
3055+
{
3056+
return cx.pretty_print_opaque_impl_type(self.def_id, self.args);
3057+
} else {
3058+
p!(print_def_path(self.def_id, self.args));
3059+
}
3060+
30573061
}
30583062
}
30593063

tests/ui/impl-trait/in-trait/async-and-ret-ref.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ trait T {}
55

66
trait MyTrait {
77
async fn foo() -> &'static impl T;
8-
//~^ ERROR the associated type `<Self as MyTrait>::{opaque#0}` may not live long enough
8+
//~^ ERROR the associated type `impl T` may not live long enough
99
}
1010

1111
fn main() {}

tests/ui/impl-trait/in-trait/async-and-ret-ref.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error[E0310]: the associated type `<Self as MyTrait>::{synthetic#0}` may not live long enough
1+
error[E0310]: the associated type `impl T` may not live long enough
22
--> $DIR/async-and-ret-ref.rs:7:5
33
|
44
LL | async fn foo() -> &'static impl T;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
| |
7-
| the associated type `<Self as MyTrait>::{synthetic#0}` must be valid for the static lifetime...
7+
| the associated type `impl T` must be valid for the static lifetime...
88
| ...so that the reference type `&'static impl T` does not outlive the data it points at
99

1010
error: aborting due to 1 previous error

tests/ui/impl-trait/in-trait/missing-static-bound-from-impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ trait Erased {
99
impl<T: Original> Erased for T {
1010
fn f(&self) -> Box<dyn Fn()> {
1111
Box::new(<T as Original>::f())
12-
//~^ ERROR the associated type `<T as Original>::{opaque#0}` may not live long enough
12+
//~^ ERROR the associated type `impl Fn()` may not live long enough
1313
}
1414
}
1515

tests/ui/impl-trait/in-trait/missing-static-bound-from-impl.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error[E0310]: the associated type `<T as Original>::{synthetic#0}` may not live long enough
1+
error[E0310]: the associated type `impl Fn()` may not live long enough
22
--> $DIR/missing-static-bound-from-impl.rs:11:9
33
|
44
LL | Box::new(<T as Original>::f())
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
| |
7-
| the associated type `<T as Original>::{synthetic#0}` must be valid for the static lifetime...
7+
| the associated type `impl Fn()` must be valid for the static lifetime...
88
| ...so that the type `impl Fn()` will meet its required lifetime bounds
99

1010
error: aborting due to 1 previous error

0 commit comments

Comments
 (0)