bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Simplify some match statements on `DefPathDataName'

Browse source
This commit is contained in:
marmeladema 2020-09-01 13:11:28 +01:00
parent 75130b06bf
commit bb8e1764bb
3 changed files with 5 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs
View file

@ -7,7 +7,7 @@ use crate::common::CodegenCx;
use crate::llvm; use crate::llvm;
use crate::llvm::debuginfo::DIScope; use crate::llvm::debuginfo::DIScope;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_hir::definitions::{DefPathData, DefPathDataName}; use rustc_hir::definitions::DefPathData;
use rustc_span::symbol::Symbol; use rustc_span::symbol::Symbol;
pub fn mangled_name_of_instance<'a, 'tcx>( pub fn mangled_name_of_instance<'a, 'tcx>(
@ -30,12 +30,7 @@ pub fn item_namespace(cx: &CodegenCx<'ll, '_>, def_id: DefId) -> &'ll DIScope {
let namespace_name = match def_key.disambiguated_data.data { let namespace_name = match def_key.disambiguated_data.data {
DefPathData::CrateRoot => cx.tcx.crate_name(def_id.krate), DefPathData::CrateRoot => cx.tcx.crate_name(def_id.krate),
data => match data.name() { data => Symbol::intern(&data.to_string()),
DefPathDataName::Named(name) => name,
DefPathDataName::Anon { namespace } => {
Symbol::intern(&format!("{{{{{}}}}}", namespace))
}
},
}; };
let namespace_name = namespace_name.as_str(); let namespace_name = namespace_name.as_str();

9
compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs
View file

@ -3,7 +3,6 @@
use rustc_data_structures::fx::FxHashSet; use rustc_data_structures::fx::FxHashSet;
use rustc_hir as hir; use rustc_hir as hir;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_hir::definitions::DefPathDataName;
use rustc_middle::ty::{self, subst::SubstsRef, Ty, TyCtxt}; use rustc_middle::ty::{self, subst::SubstsRef, Ty, TyCtxt};
use std::fmt::Write; use std::fmt::Write;
@ -231,13 +230,7 @@ pub fn push_debuginfo_type_name<'tcx>(
if qualified { if qualified {
output.push_str(&tcx.crate_name(def_id.krate).as_str()); output.push_str(&tcx.crate_name(def_id.krate).as_str());
for path_element in tcx.def_path(def_id).data { for path_element in tcx.def_path(def_id).data {
output.push_str("::"); write!(output, "::{}", path_element.data).unwrap();
match path_element.data.name() {
DefPathDataName::Named(name) => output.push_str(&name.as_str()),
DefPathDataName::Anon { namespace } => {
write!(output, "{{{{{}}}}}", namespace).unwrap()
}
}
} }
} else { } else {
output.push_str(&tcx.item_name(def_id).as_str()); output.push_str(&tcx.item_name(def_id).as_str());

9
compiler/rustc_lint/src/context.rs
View file

@ -26,7 +26,7 @@ use rustc_errors::{struct_span_err, Applicability};
use rustc_hir as hir; use rustc_hir as hir;
use rustc_hir::def::Res; use rustc_hir::def::Res;
use rustc_hir::def_id::{CrateNum, DefId}; use rustc_hir::def_id::{CrateNum, DefId};
use rustc_hir::definitions::{DefPathData, DefPathDataName, DisambiguatedDefPathData}; use rustc_hir::definitions::{DefPathData, DisambiguatedDefPathData};
use rustc_middle::lint::LintDiagnosticBuilder; use rustc_middle::lint::LintDiagnosticBuilder;
use rustc_middle::middle::privacy::AccessLevels; use rustc_middle::middle::privacy::AccessLevels;
use rustc_middle::middle::stability; use rustc_middle::middle::stability;
@ -846,12 +846,7 @@ impl<'tcx> LateContext<'tcx> {
return Ok(path); return Ok(path);
} }
path.push(match disambiguated_data.data.name() { path.push(Symbol::intern(&disambiguated_data.data.to_string()));
DefPathDataName::Named(name) => name,
DefPathDataName::Anon { namespace } => {
Symbol::intern(&format!("{{{{{}}}}}", namespace))
}
});
Ok(path) Ok(path)
} }