Skip to content

Commit 657ecdb

Browse files
committed
Rename DefPathData::get_name() to DefPathData::name()
1 parent 2708ad8 commit 657ecdb

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub fn item_namespace(cx: &CodegenCx<'ll, '_>, def_id: DefId) -> &'ll DIScope {
3030

3131
let namespace_name = match def_key.disambiguated_data.data {
3232
DefPathData::CrateRoot => cx.tcx.crate_name(def_id.krate),
33-
data => match data.get_name() {
33+
data => match data.name() {
3434
DefPathDataName::Named(name) => name,
3535
DefPathDataName::Anon { namespace } => {
3636
Symbol::intern(&format!("{{{{{}}}}}", namespace))

compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ pub fn push_debuginfo_type_name<'tcx>(
232232
output.push_str(&tcx.crate_name(def_id.krate).as_str());
233233
for path_element in tcx.def_path(def_id).data {
234234
output.push_str("::");
235-
match path_element.data.get_name() {
235+
match path_element.data.name() {
236236
DefPathDataName::Named(name) => output.push_str(&name.as_str()),
237237
DefPathDataName::Anon { namespace } => {
238238
write!(output, "{{{{{}}}}}", namespace).unwrap()

compiler/rustc_hir/src/definitions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ pub struct DisambiguatedDefPathData {
157157

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

compiler/rustc_lint/src/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ impl<'tcx> LateContext<'tcx> {
846846
return Ok(path);
847847
}
848848

849-
path.push(match disambiguated_data.data.get_name() {
849+
path.push(match disambiguated_data.data.name() {
850850
DefPathDataName::Named(name) => name,
851851
DefPathDataName::Anon { namespace } => {
852852
Symbol::intern(&format!("{{{{{}}}}}", namespace))

compiler/rustc_middle/src/ty/print/pretty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,7 @@ impl<F: fmt::Write> Printer<'tcx> for FmtPrinter<'_, 'tcx, F> {
14981498

14991499
// FIXME(eddyb) `name` should never be empty, but it
15001500
// currently is for `extern { ... }` "foreign modules".
1501-
let name = disambiguated_data.data.get_name();
1501+
let name = disambiguated_data.data.name();
15021502
if name != DefPathDataName::Named(kw::Invalid) {
15031503
if !self.empty_path {
15041504
write!(self, "::")?;

compiler/rustc_middle/src/ty/query/profiling_support.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ impl<'p, 'c, 'tcx> QueryKeyStringBuilder<'p, 'c, 'tcx> {
6666
end_index = 3;
6767
}
6868
other => {
69-
name = match other.get_name() {
69+
name = match other.name() {
7070
DefPathDataName::Named(name) => {
7171
dis = "";
7272
end_index = 3;

compiler/rustc_mir/src/monomorphize/partitioning/default.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ fn compute_codegen_unit_name(
355355
*cache.entry((cgu_def_id, volatile)).or_insert_with(|| {
356356
let def_path = tcx.def_path(cgu_def_id);
357357

358-
let components = def_path.data.iter().map(|part| match part.data.get_name() {
358+
let components = def_path.data.iter().map(|part| match part.data.name() {
359359
DefPathDataName::Named(name) => name,
360360
DefPathDataName::Anon { namespace } => {
361361
Symbol::intern(&format!("{{{{{}}}}}", namespace))

0 commit comments

Comments
 (0)