Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix pretty printing of placeholder types

Browse Source
This commit is contained in:
Michael Goulet
2025-06-25 17:07:18 +00:00
parent 74570e526e
commit d79b669b09
8 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/rustc_infer/src/infer/region_constraints/mod.rs
+1 -1
View File
@@ -655,7 +655,7 @@ impl<'tcx> fmt::Display for GenericKind<'tcx> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match *self {
GenericKind::Param(ref p) => write!(f, "{p}"),
GenericKind::Placeholder(ref p) => write!(f, "{p:?}"),
GenericKind::Placeholder(ref p) => write!(f, "{p}"),
GenericKind::Alias(ref p) => write!(f, "{p}"),
}
}
compiler/rustc_middle/src/ty/print/pretty.rs
+11 -7
View File
@@ -822,13 +822,7 @@ fn pretty_print_type(&mut self, ty: Ty<'tcx>) -> Result<(), PrintError> {
ty::Alias(ty::Projection | ty::Inherent | ty::Free, ref data) => {
p!(print(data))
}
ty::Placeholder(placeholder) => match placeholder.bound.kind {
ty::BoundTyKind::Anon => p!(write("{placeholder:?}")),
ty::BoundTyKind::Param(def_id) => match self.should_print_verbose() {
true => p!(write("{:?}", ty.kind())),
false => p!(write("{}", self.tcx().item_name(def_id))),
},
},
ty::Placeholder(placeholder) => p!(print(placeholder)),
ty::Alias(ty::Opaque, ty::AliasTy { def_id, args, .. }) => {
// We use verbose printing in 'NO_QUERIES' mode, to
// avoid needing to call `predicates_of`. This should
@@ -3373,6 +3367,16 @@ macro_rules! define_print_and_forward_display {
p!(write("{}", self.name))
}
ty::PlaceholderType {
match self.bound.kind {
ty::BoundTyKind::Anon => p!(write("{self:?}")),
ty::BoundTyKind::Param(def_id) => match cx.should_print_verbose() {
true => p!(write("{self:?}")),
false => p!(write("{}", cx.tcx().item_name(def_id))),
},
}
}
ty::ParamConst {
p!(write("{}", self.name))
}
compiler/rustc_middle/src/ty/structural_impls.rs
+1 -1
View File
@@ -272,7 +272,6 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
crate::ty::BoundVar,
crate::ty::InferConst,
crate::ty::Placeholder<crate::ty::BoundRegion>,
crate::ty::Placeholder<crate::ty::BoundTy>,
crate::ty::Placeholder<ty::BoundVar>,
crate::ty::UserTypeAnnotationIndex,
crate::ty::ValTree<'tcx>,
@@ -303,6 +302,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
// tidy-alphabetical-start
crate::ty::ParamConst,
crate::ty::ParamTy,
crate::ty::Placeholder<crate::ty::BoundTy>,
crate::ty::instance::ReifyReason,
rustc_hir::def_id::DefId,
// tidy-alphabetical-end
compiler/rustc_trait_selection/src/error_reporting/infer/region.rs
+6 -6
View File
@@ -713,14 +713,14 @@ pub fn construct_generic_bound_failure(
}
let labeled_user_string = match bound_kind {
GenericKind::Param(ref p) => format!("the parameter type `{p}`"),
GenericKind::Placeholder(ref p) => format!("the placeholder type `{p:?}`"),
GenericKind::Alias(ref p) => match p.kind(self.tcx) {
GenericKind::Param(_) => format!("the parameter type `{bound_kind}`"),
GenericKind::Placeholder(_) => format!("the placeholder type `{bound_kind}`"),
GenericKind::Alias(p) => match p.kind(self.tcx) {
ty::Projection | ty::Inherent => {
format!("the associated type `{p}`")
format!("the associated type `{bound_kind}`")
}
ty::Free => format!("the type alias `{p}`"),
ty::Opaque => format!("the opaque type `{p}`"),
ty::Free => format!("the type alias `{bound_kind}`"),
ty::Opaque => format!("the opaque type `{bound_kind}`"),
},
};
tests/ui/traits/non_lifetime_binders/placeholders-dont-outlive-static.bad.stderr
+4 -4
View File
@@ -7,19 +7,19 @@ LL | #![feature(non_lifetime_binders)]
= note: see issue #108185 <https://github.com/rust-lang/rust/issues/108185> for more information
= note: `#[warn(incomplete_features)]` on by default
error[E0310]: the placeholder type `!1_"T"` may not live long enough
error[E0310]: the placeholder type `T` may not live long enough
--> $DIR/placeholders-dont-outlive-static.rs:13:5
|
LL | foo();
| ^^^^^
| |
| the placeholder type `!1_"T"` must be valid for the static lifetime...
| the placeholder type `T` must be valid for the static lifetime...
| ...so that the type `T` will meet its required lifetime bounds
|
help: consider adding an explicit lifetime bound
|
LL | fn bad() where !1_"T": 'static {
| +++++++++++++++++++++
LL | fn bad() where T: 'static {
| ++++++++++++++++
error: aborting due to 1 previous error; 1 warning emitted
tests/ui/traits/non_lifetime_binders/placeholders-dont-outlive-static.good.stderr
+4 -4
View File
@@ -7,19 +7,19 @@ LL | #![feature(non_lifetime_binders)]
= note: see issue #108185 <https://github.com/rust-lang/rust/issues/108185> for more information
= note: `#[warn(incomplete_features)]` on by default
error[E0310]: the placeholder type `!1_"T"` may not live long enough
error[E0310]: the placeholder type `T` may not live long enough
--> $DIR/placeholders-dont-outlive-static.rs:19:5
|
LL | foo();
| ^^^^^
| |
| the placeholder type `!1_"T"` must be valid for the static lifetime...
| the placeholder type `T` must be valid for the static lifetime...
| ...so that the type `T` will meet its required lifetime bounds
|
help: consider adding an explicit lifetime bound
|
LL | fn good() where for<T> T: 'static, !1_"T": 'static {
| +++++++++++++++++
LL | fn good() where for<T> T: 'static, T: 'static {
| ++++++++++++
error: aborting due to 1 previous error; 1 warning emitted
tests/ui/traits/non_lifetime_binders/placeholders-dont-outlive-static.rs
+1 -1
View File
@@ -11,7 +11,7 @@ fn foo() where for<T> T: 'static {}
#[cfg(bad)]
fn bad() {
foo();
//[bad]~^ ERROR the placeholder type `!1_"T"` may not live long enough
//[bad]~^ ERROR the placeholder type `T` may not live long enough
}
#[cfg(good)]
tests/ui/traits/non_lifetime_binders/type-match-with-late-bound.stderr
+13 -12
View File
@@ -7,11 +7,11 @@ LL | #![feature(non_lifetime_binders)]
= note: see issue #108185 <https://github.com/rust-lang/rust/issues/108185> for more information
= note: `#[warn(incomplete_features)]` on by default
error[E0309]: the placeholder type `!1_"F"` may not live long enough
error[E0309]: the placeholder type `F` may not live long enough
--> $DIR/type-match-with-late-bound.rs:8:1
|
LL | async fn walk2<'a, T: 'a>(_: T)
| ^ -- the placeholder type `!1_"F"` must be valid for the lifetime `'a` as defined here...
| ^ -- the placeholder type `F` must be valid for the lifetime `'a` as defined here...
| _|
| |
LL | | where
@@ -25,36 +25,37 @@ LL | for<F> F: 'a,
| ^^
help: consider adding an explicit lifetime bound
|
LL | for<F> F: 'a, !1_"F": 'a
| ++++++++++
LL | for<F> F: 'a, F: 'a
| +++++
error[E0309]: the placeholder type `!1_"F"` may not live long enough
error[E0309]: the placeholder type `F` may not live long enough
--> $DIR/type-match-with-late-bound.rs:11:1
|
LL | async fn walk2<'a, T: 'a>(_: T)
| -- the placeholder type `!1_"F"` must be valid for the lifetime `'a` as defined here...
| -- the placeholder type `F` must be valid for the lifetime `'a` as defined here...
...
LL | {}
| ^^ ...so that the type `F` will meet its required lifetime bounds
|
help: consider adding an explicit lifetime bound
|
LL | for<F> F: 'a, !1_"F": 'a
| ++++++++++
LL | for<F> F: 'a, F: 'a
| +++++
error[E0309]: the placeholder type `!2_"F"` may not live long enough
error[E0309]: the placeholder type `F` may not live long enough
--> $DIR/type-match-with-late-bound.rs:11:1
|
LL | async fn walk2<'a, T: 'a>(_: T)
| -- the placeholder type `!2_"F"` must be valid for the lifetime `'a` as defined here...
| -- the placeholder type `F` must be valid for the lifetime `'a` as defined here...
...
LL | {}
| ^^ ...so that the type `F` will meet its required lifetime bounds
|
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
help: consider adding an explicit lifetime bound
|
LL | for<F> F: 'a, !2_"F": 'a
| ++++++++++
LL | for<F> F: 'a, F: 'a
| +++++
error: aborting due to 3 previous errors; 1 warning emitted