bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix pretty-printing of DisambiguatedDefPathData

Browse source
This commit is contained in:
marmeladema 2020-08-31 23:26:15 +01:00
parent 9f50c49117
commit 2708ad8bb4
2 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_middle/src/ty/print/pretty.rs
View file

@ -1496,27 +1496,16 @@ impl<F: fmt::Write> Printer<'tcx> for FmtPrinter<'_, 'tcx, F> {
return Ok(self);
}
let name = match disambiguated_data.data.get_name() {
DefPathDataName::Named(name) => name,
DefPathDataName::Anon { namespace } => namespace,
};
// FIXME(eddyb) `name` should never be empty, but it
// currently is for `extern { ... }` "foreign modules".
if name != kw::Invalid {
let name = disambiguated_data.data.get_name();
if name != DefPathDataName::Named(kw::Invalid) {
if !self.empty_path {
write!(self, "::")?;
}
if Ident::with_dummy_span(name).is_raw_guess() {
write!(self, "r#")?;
}
match disambiguated_data.data.get_name() {
DefPathDataName::Named(name) => self.write_str(&name.as_str())?,
DefPathDataName::Anon { namespace } => {
write!(self, "{{{}#{}}}", namespace, disambiguated_data.disambiguator)?
}
}
let verbose = self.tcx.sess.verbose();
disambiguated_data.fmt_maybe_verbose(&mut self, verbose)?;
self.empty_path = false;
}