Skip to content

Commit c3fd0e1

Browse files
GuillaumeGomezGuillaumeGomez
committed
Remove token::get_name when unneeded
1 parent 50df2a0 commit c3fd0e1

File tree

2 files changed

+60
-50
lines changed

2 files changed

+60
-50
lines changed

‎src/librustc_resolve/lib.rs

Lines changed: 45 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,14 @@ mod record_exports;
109109
mod build_reduced_graph;
110110
mod resolve_imports;
111111

112+
macro_rules! resolve_err {
113+
($this:expr, $($rest:tt)*) => {
114+
if $this.emit_errors {
115+
span_err!($this.session, $($rest)*);
116+
}
117+
}
118+
}
119+
112120
#[derive(Copy, Clone)]
113121
struct BindingInfo {
114122
span: Span,
@@ -947,8 +955,8 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
947955
if module.external_module_children.borrow().contains_key(&name) {
948956
span_err!(self.session, span, E0259,
949957
"an external crate named `{}` has already \
950-
been imported into this module",
951-
&token::get_name(name));
958+
been imported into this module",
959+
name);
952960
}
953961
}
954962

@@ -960,9 +968,9 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
960968
if module.external_module_children.borrow().contains_key(&name) {
961969
span_err!(self.session, span, E0260,
962970
"the name `{}` conflicts with an external \
963-
crate that has been imported into this \
964-
module",
965-
&token::get_name(name));
971+
crate that has been imported into this \
972+
module",
973+
name);
966974
}
967975
}
968976

@@ -1041,7 +1049,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
10411049
Indeterminate => {
10421050
debug!("(resolving module path for import) module \
10431051
resolution is indeterminate: {}",
1044-
token::get_name(name));
1052+
name);
10451053
return Indeterminate;
10461054
}
10471055
Success((target, used_proxy)) => {
@@ -1052,7 +1060,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
10521060
match type_def.module_def {
10531061
None => {
10541062
let msg = format!("Not a module `{}`",
1055-
token::get_name(name));
1063+
name);
10561064

10571065
return Failed(Some((span, msg)));
10581066
}
@@ -1078,7 +1086,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
10781086
None => {
10791087
// There are no type bindings at all.
10801088
let msg = format!("Not a module `{}`",
1081-
token::get_name(name));
1089+
name);
10821090
return Failed(Some((span, msg)));
10831091
}
10841092
}
@@ -1200,7 +1208,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
12001208
-> ResolveResult<(Target, bool)> {
12011209
debug!("(resolving item in lexical scope) resolving `{}` in \
12021210
namespace {:?} in `{}`",
1203-
token::get_name(name),
1211+
name,
12041212
namespace,
12051213
module_to_string(&*module_));
12061214

@@ -1302,9 +1310,11 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
13021310
namespace,
13031311
PathSearch,
13041312
true) {
1305-
Failed(Some((span, msg))) =>
1306-
self.resolve_error(span, &format!("failed to resolve. {}",
1307-
msg)),
1313+
Failed(Some((span, msg))) => {
1314+
self.resolve_error(span,
1315+
&format!("failed to resolve. {}",
1316+
msg));
1317+
},
13081318
Failed(None) => (), // Continue up the search chain.
13091319
Indeterminate => {
13101320
// We couldn't see through the higher scope because of an
@@ -1469,7 +1479,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
14691479
allow_private_imports: bool)
14701480
-> ResolveResult<(Target, bool)> {
14711481
debug!("(resolving name in module) resolving `{}` in `{}`",
1472-
&token::get_name(name),
1482+
name,
14731483
module_to_string(&*module_));
14741484

14751485
// First, check the direct children of the module.
@@ -1547,7 +1557,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
15471557

15481558
// We're out of luck.
15491559
debug!("(resolving name in module) failed to resolve `{}`",
1550-
&token::get_name(name));
1560+
name);
15511561
return Failed(None);
15521562
}
15531563

@@ -1623,15 +1633,15 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
16231633
match orig_module.children.borrow().get(&name) {
16241634
None => {
16251635
debug!("!!! (with scope) didn't find `{}` in `{}`",
1626-
token::get_name(name),
1636+
name,
16271637
module_to_string(&*orig_module));
16281638
}
16291639
Some(name_bindings) => {
16301640
match (*name_bindings).get_module_if_available() {
16311641
None => {
16321642
debug!("!!! (with scope) didn't find module \
16331643
for `{}` in `{}`",
1634-
token::get_name(name),
1644+
name,
16351645
module_to_string(&*orig_module));
16361646
}
16371647
Some(module_) => {
@@ -1795,7 +1805,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
17951805
let name = item.ident.name;
17961806

17971807
debug!("(resolving item) resolving {}",
1798-
token::get_name(name));
1808+
name);
17991809

18001810
match item.node {
18011811
ItemEnum(_, ref generics) |
@@ -1931,7 +1941,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
19311941
used for a type \
19321942
parameter in this type \
19331943
parameter list",
1934-
token::get_name(name)))
1944+
name))
19351945
}
19361946
seen_bindings.insert(name);
19371947

@@ -2177,7 +2187,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
21772187
let path_str = path_names_to_string(&trait_ref.path, 0);
21782188
self.resolve_error(span,
21792189
&format!("method `{}` is not a member of trait `{}`",
2180-
token::get_name(name),
2190+
name,
21812191
path_str));
21822192
}
21832193
}
@@ -2229,7 +2239,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
22292239
p.span,
22302240
&format!("variable `{}` from pattern #1 is \
22312241
not bound in pattern #{}",
2232-
token::get_name(key),
2242+
key,
22332243
i + 1));
22342244
}
22352245
Some(binding_i) => {
@@ -2238,7 +2248,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
22382248
binding_i.span,
22392249
&format!("variable `{}` is bound with different \
22402250
mode in pattern #{} than in pattern #1",
2241-
token::get_name(key),
2251+
key,
22422252
i + 1));
22432253
}
22442254
}
@@ -2251,7 +2261,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
22512261
binding.span,
22522262
&format!("variable `{}` from pattern {}{} is \
22532263
not bound in pattern {}1",
2254-
token::get_name(key),
2264+
key,
22552265
"#", i + 1, "#"));
22562266
}
22572267
}
@@ -2410,7 +2420,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
24102420
if mode == RefutableMode => {
24112421
debug!("(resolving pattern) resolving `{}` to \
24122422
struct or enum variant",
2413-
token::get_name(renamed));
2423+
renamed);
24142424

24152425
self.enforce_default_binding_mode(
24162426
pattern,
@@ -2428,12 +2438,12 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
24282438
&format!("declaration of `{}` shadows an enum \
24292439
variant or unit-like struct in \
24302440
scope",
2431-
token::get_name(renamed)));
2441+
renamed));
24322442
}
24332443
FoundConst(def, lp) if mode == RefutableMode => {
24342444
debug!("(resolving pattern) resolving `{}` to \
24352445
constant",
2436-
token::get_name(renamed));
2446+
renamed);
24372447

24382448
self.enforce_default_binding_mode(
24392449
pattern,
@@ -2452,7 +2462,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
24522462
}
24532463
BareIdentifierPatternUnresolved => {
24542464
debug!("(resolving pattern) binding `{}`",
2455-
token::get_name(renamed));
2465+
renamed);
24562466

24572467
let def = DefLocal(pattern.id);
24582468

@@ -2639,7 +2649,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
26392649
Success((target, _)) => {
26402650
debug!("(resolve bare identifier pattern) succeeded in \
26412651
finding {} at {:?}",
2642-
token::get_name(name),
2652+
name,
26432653
target.bindings.value_def.borrow());
26442654
match *target.bindings.value_def.borrow() {
26452655
None => {
@@ -2685,7 +2695,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
26852695
}
26862696

26872697
debug!("(resolve bare identifier pattern) failed to find {}",
2688-
token::get_name(name));
2698+
name);
26892699
return BareIdentifierPatternUnresolved;
26902700
}
26912701
}
@@ -3043,13 +3053,13 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
30433053
// found a module instead. Modules don't have defs.
30443054
debug!("(resolving item path by identifier in lexical \
30453055
scope) failed to resolve {} after success...",
3046-
token::get_name(name));
3056+
name);
30473057
return None;
30483058
}
30493059
Some(def) => {
30503060
debug!("(resolving item path in lexical scope) \
30513061
resolved `{}` to item",
3052-
token::get_name(name));
3062+
name);
30533063
// This lookup is "all public" because it only searched
30543064
// for one identifier in the current module (couldn't
30553065
// have passed through reexports or anything like that.
@@ -3062,7 +3072,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
30623072
}
30633073
Failed(err) => {
30643074
debug!("(resolving item path by identifier in lexical scope) \
3065-
failed to resolve {}", token::get_name(name));
3075+
failed to resolve {}", name);
30663076

30673077
if let Some((span, msg)) = err {
30683078
self.resolve_error(span, &format!("failed to resolve. {}", msg))
@@ -3472,15 +3482,15 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
34723482

34733483
fn get_traits_containing_item(&mut self, name: Name) -> Vec<DefId> {
34743484
debug!("(getting traits containing item) looking for '{}'",
3475-
token::get_name(name));
3485+
name);
34763486

34773487
fn add_trait_info(found_traits: &mut Vec<DefId>,
34783488
trait_def_id: DefId,
34793489
name: Name) {
34803490
debug!("(adding trait info) found trait {}:{} for method '{}'",
34813491
trait_def_id.krate,
34823492
trait_def_id.node,
3483-
token::get_name(name));
3493+
name);
34843494
found_traits.push(trait_def_id);
34853495
}
34863496

@@ -3591,7 +3601,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
35913601
debug!("Children:");
35923602
build_reduced_graph::populate_module_if_necessary(self, &module_);
35933603
for (&name, _) in module_.children.borrow().iter() {
3594-
debug!("* {}", token::get_name(name));
3604+
debug!("* {}", name);
35953605
}
35963606

35973607
debug!("Import resolutions:");
@@ -3615,7 +3625,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
36153625
}
36163626
}
36173627

3618-
debug!("* {}:{}{}", token::get_name(name), value_repr, type_repr);
3628+
debug!("* {}:{}{}", name, value_repr, type_repr);
36193629
}
36203630
}
36213631
}

0 commit comments

Comments
 (0)