mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename DefPathData::get_name() to DefPathData::name()

Browse Source
This commit is contained in:
marmeladema 2020-09-01 00:42:30 +01:00
parent 2708ad8bb4
commit 657ecdb75e
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs
View File

@ -30,7 +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.get_name() { data => match data.name() {
DefPathDataName::Named(name) => name, DefPathDataName::Named(name) => name,
DefPathDataName::Anon { namespace } => { DefPathDataName::Anon { namespace } => {
Symbol::intern(&format!("{{{{{}}}}}", namespace)) Symbol::intern(&format!("{{{{{}}}}}", namespace))

2
compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs
View File

@ -232,7 +232,7 @@ pub fn push_debuginfo_type_name<'tcx>(
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("::"); output.push_str("::");
match path_element.data.get_name() { match path_element.data.name() {
DefPathDataName::Named(name) => output.push_str(&name.as_str()), DefPathDataName::Named(name) => output.push_str(&name.as_str()),
DefPathDataName::Anon { namespace } => { DefPathDataName::Anon { namespace } => {
write!(output, "{{{{{}}}}}", namespace).unwrap() write!(output, "{{{{{}}}}}", namespace).unwrap()

2
compiler/rustc_hir/src/definitions.rs
View File

@ -157,7 +157,7 @@ pub struct DisambiguatedDefPathData {
impl DisambiguatedDefPathData { impl DisambiguatedDefPathData {
pub fn fmt_maybe_verbose(&self, writer: &mut impl Write, verbose: bool) -> fmt::Result { pub fn fmt_maybe_verbose(&self, writer: &mut impl Write, verbose: bool) -> fmt::Result {
match self.data.get_name() { match self.data.name() {
DefPathDataName::Named(name) => { DefPathDataName::Named(name) => {
if Ident::with_dummy_span(name).is_raw_guess() { if Ident::with_dummy_span(name).is_raw_guess() {
writer.write_str("r#")?; writer.write_str("r#")?;

2
compiler/rustc_lint/src/context.rs
View File

@ -846,7 +846,7 @@ impl<'tcx> LateContext<'tcx> {
return Ok(path); return Ok(path);
} }
path.push(match disambiguated_data.data.get_name() { path.push(match disambiguated_data.data.name() {
DefPathDataName::Named(name) => name, DefPathDataName::Named(name) => name,
DefPathDataName::Anon { namespace } => { DefPathDataName::Anon { namespace } => {
Symbol::intern(&format!("{{{{{}}}}}", namespace)) Symbol::intern(&format!("{{{{{}}}}}", namespace))

2
compiler/rustc_middle/src/ty/print/pretty.rs
View File

@ -1498,7 +1498,7 @@ impl<F: fmt::Write> Printer<'tcx> for FmtPrinter<'_, 'tcx, F> {
// FIXME(eddyb) `name` should never be empty, but it // FIXME(eddyb) `name` should never be empty, but it
// currently is for `extern { ... }` "foreign modules". // currently is for `extern { ... }` "foreign modules".
let name = disambiguated_data.data.get_name(); let name = disambiguated_data.data.name();
if name != DefPathDataName::Named(kw::Invalid) { if name != DefPathDataName::Named(kw::Invalid) {
if !self.empty_path { if !self.empty_path {
write!(self, "::")?; write!(self, "::")?;

2
compiler/rustc_middle/src/ty/query/profiling_support.rs
View File

@ -66,7 +66,7 @@ impl<'p, 'c, 'tcx> QueryKeyStringBuilder<'p, 'c, 'tcx> {
end_index = 3; end_index = 3;
} }
other => { other => {
name = match other.get_name() { name = match other.name() {
DefPathDataName::Named(name) => { DefPathDataName::Named(name) => {
dis = ""; dis = "";
end_index = 3; end_index = 3;

2
compiler/rustc_mir/src/monomorphize/partitioning/default.rs
View File

@ -355,7 +355,7 @@ fn compute_codegen_unit_name(
*cache.entry((cgu_def_id, volatile)).or_insert_with(|| { *cache.entry((cgu_def_id, volatile)).or_insert_with(|| {
let def_path = tcx.def_path(cgu_def_id); let def_path = tcx.def_path(cgu_def_id);
let components = def_path.data.iter().map(|part| match part.data.get_name() { let components = def_path.data.iter().map(|part| match part.data.name() {
DefPathDataName::Named(name) => name, DefPathDataName::Named(name) => name,
DefPathDataName::Anon { namespace } => { DefPathDataName::Anon { namespace } => {
Symbol::intern(&format!("{{{{{}}}}}", namespace)) Symbol::intern(&format!("{{{{{}}}}}", namespace))