Skip to content

Deduplicate pretty printing of constants #67133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Mar 16, 2020
Merged

Deduplicate pretty printing of constants #67133

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
02dbb35
Deduplicate and clean up pretty printing logic
oli-obk Dec 23, 2019
02f4eeb
Address review comments around `type_ascribed_value`
oli-obk Jan 27, 2020
3b82edd
Print braces only in print_ty mode
oli-obk Feb 5, 2020
4ddb4bd
Eliminate all ParamEnv::empty uses in pretty printing
oli-obk Feb 5, 2020
e22ddfd
Don't print leading zeros on hex dumps constants
oli-obk Feb 5, 2020
b837e71
Reduce special casing in the const pretty printer
oli-obk Feb 10, 2020
b2e93a4
Print leading zeros for non pointers
oli-obk Feb 10, 2020
1191eb4
Prefer fall through to code repetition
oli-obk Feb 12, 2020
154f3f1
Don't print all zsts as their type as it makes no sense for more comp…
oli-obk Feb 12, 2020
b78dbf4
Reuse type ascripted printing for type cast printing
oli-obk Feb 13, 2020
fff2e0f
Print function pointer type for function pointer const generics
oli-obk Feb 26, 2020
cc9ca64
Don't print literal type suffixes if `print_ty` is false
oli-obk Feb 26, 2020
2e91065
Generalize typed value printing and use for undef printing
oli-obk Feb 26, 2020
db9ddf1
Address review comments
oli-obk Mar 11, 2020
d0b1211
Comment nit
oli-obk Mar 12, 2020
6e73a14
Remove fn special casing in const printing
oli-obk Mar 12, 2020
306df94
Print ConstKind::Bound the same as TyKind::Bound
oli-obk Mar 13, 2020
6ca65bd
Print ConstKind::Placeholder just like TyKind::Placeholder
oli-obk Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 26 additions & 11 deletions src/librustc/ty/print/pretty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,16 +858,23 @@ pub trait PrettyPrinter<'tcx>:

macro_rules! print_underscore {
() => {{
p!(write("_"));
if print_ty {
p!(write(": "), print(ct.ty));
self = self.typed_value(
|mut this| {
write!(this, "_")?;
Ok(this)
},
|this| this.print_type(ct.ty),
": ",
)?;
} else {
write!(self, "_")?;
}
}};
}

match (ct.val, &ct.ty.kind) {
(_, ty::FnDef(did, substs)) => p!(print_value_path(*did, substs)),
(ty::ConstKind::Unevaluated(did, substs, promoted), _) => {
match ct.val {
ty::ConstKind::Unevaluated(did, substs, promoted) => {
if let Some(promoted) = promoted {
p!(print_value_path(did, substs));
p!(write("::{:?}", promoted));
Expand All @@ -892,17 +899,25 @@ pub trait PrettyPrinter<'tcx>:
}
}
}
(ty::ConstKind::Infer(..), _) => print_underscore!(),
(ty::ConstKind::Param(ParamConst { name, .. }), _) => p!(write("{}", name)),
(ty::ConstKind::Value(value), _) => {
ty::ConstKind::Infer(..) => print_underscore!(),
ty::ConstKind::Param(ParamConst { name, .. }) => p!(write("{}", name)),
ty::ConstKind::Value(value) => {
return self.pretty_print_const_value(value, ct.ty, print_ty);
}

_ => {
ty::ConstKind::Bound(..) | ty::ConstKind::Placeholder(_) => {
// fallback
p!(write("{:?}", ct.val));
if print_ty {
p!(write(": "), print(ct.ty));
self = self.typed_value(
|mut this| {
write!(this, "{:?}", ct.val)?;
Ok(this)
},
|this| this.print_type(ct.ty),
": ",
)?;
} else {
p!(write("{:?}", ct.val));
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/const-generics/cannot-infer-const-args.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ error[E0282]: type annotations needed
--> $DIR/cannot-infer-const-args.rs:9:5
|
LL | foo();
| ^^^ cannot infer type for fn item `fn() -> usize {foo::<_: usize>}`
| ^^^ cannot infer type for fn item `fn() -> usize {foo::<{_: usize}>}`

error: aborting due to previous error

Expand Down