Skip to content
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

Jump to bottom

Fix ICE in const pretty printing and resolve FIXME #67909

Merged
merged 1 commit into from
Jan 7, 2020
Merged

Fix ICE in const pretty printing and resolve FIXME #67909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 5 additions & 12 deletions src/librustc/ty/print/obsolete.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,19 +165,12 @@ impl DefPathBasedNames<'tcx> {
}

// Pushes the the name of the specified const to the provided string.
// If `debug` is true, usually-unprintable consts (such as `Infer`) will be printed,
// as well as the unprintable types of constants (see `push_type_name` for more details).
pub fn push_const_name(&self, c: &Const<'tcx>, output: &mut String, debug: bool) {
if let ty::ConstKind::Value(_) = c.val {
// FIXME(const_generics): we could probably do a better job here.
write!(output, "{:?}", c).unwrap()
} else if debug {
write!(output, "{:?}", c).unwrap()
} else {
bug!("DefPathBasedNames: trying to create const name for unexpected const: {:?}", c,);
}
// If `debug` is true, the unprintable types of constants will be printed with `fmt::Debug`
// (see `push_type_name` for more details).
pub fn push_const_name(&self, ct: &Const<'tcx>, output: &mut String, debug: bool) {
write!(output, "{}", ct).unwrap();
output.push_str(": ");
self.push_type_name(c.ty, output, debug);
self.push_type_name(ct.ty, output, debug);
}

pub fn push_def_path(&self, def_id: DefId, output: &mut String) {
Expand Down