Skip to content

Commit 7d754c8

Browse files
GuillaumeGomezGuillaumeGomez
committed
---
yaml --- r: 179033 b: refs/heads/master c: 1ff6e53 h: refs/heads/master i: 179031: 2085390 v: v3
1 parent 41f5188 commit 7d754c8

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 4b6632d82d59f53f0fa71be8abdc50a8353cfda1
2+
refs/heads/master: 1ff6e5356ce26a073149d0c10b82aaa8b80fb093
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ac134f7ca435551964996ee88319241cd3c7c110
55
refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77

‎trunk/src/librustc_resolve/build_reduced_graph.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
307307
ViewPathSimple(binding, ref full_path) => {
308308
let source_name =
309309
full_path.segments.last().unwrap().identifier.name;
310-
if token::get_name(source_name).get() == "mod" ||
311-
token::get_name(source_name).get() == "self" {
310+
if &token::get_name(source_name)[] == "mod" ||
311+
&token::get_name(source_name)[] == "self" {
312312
self.resolve_error(view_path.span,
313313
"`self` imports are only allowed within a { } list");
314314
}
@@ -1020,7 +1020,7 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
10201020
self.handle_external_def(def,
10211021
def_visibility,
10221022
&*child_name_bindings,
1023-
token::get_name(name).get(),
1023+
&token::get_name(name)[],
10241024
name,
10251025
root);
10261026
}

‎trunk/src/librustc_resolve/lib.rs

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
10931093
} else {
10941094
result.push_str("::")
10951095
}
1096-
result.push_str(token::get_name(*name).get());
1096+
result.push_str(&token::get_name(*name)[]);
10971097
};
10981098
result
10991099
}
@@ -1111,7 +1111,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
11111111
-> String {
11121112
match subclass {
11131113
SingleImport(_, source) => {
1114-
token::get_name(source).get().to_string()
1114+
token::get_name(source).to_string()
11151115
}
11161116
GlobImport => "*".to_string()
11171117
}
@@ -1708,7 +1708,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
17081708

17091709
debug!("(resolving glob import) writing resolution `{}` in `{}` \
17101710
to `{}`",
1711-
token::get_name(name).get(),
1711+
&token::get_name(name)[],
17121712
self.module_to_string(&*containing_module),
17131713
self.module_to_string(module_));
17141714

@@ -1725,7 +1725,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
17251725
let msg = format!("a {} named `{}` has already been imported \
17261726
in this module",
17271727
namespace_name,
1728-
token::get_name(name).get());
1728+
&token::get_name(name)[]);
17291729
span_err!(self.session, import_directive.span, E0251, "{}", msg);
17301730
} else {
17311731
let target = Target::new(containing_module.clone(),
@@ -1757,7 +1757,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
17571757
name: Name,
17581758
namespace: Namespace) {
17591759
debug!("check_for_conflicting_import: {}; target exists: {}",
1760-
token::get_name(name).get(),
1760+
&token::get_name(name)[],
17611761
target.is_some());
17621762

17631763
match *target {
@@ -1768,7 +1768,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
17681768
TypeNS => "type",
17691769
ValueNS => "value",
17701770
},
1771-
token::get_name(name).get());
1771+
&token::get_name(name)[]);
17721772
span_err!(self.session, import_span, E0252, "{}", &msg[]);
17731773
}
17741774
Some(_) | None => {}
@@ -1804,7 +1804,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
18041804
let msg = format!("import `{0}` conflicts with imported \
18051805
crate in this module \
18061806
(maybe you meant `use {0}::*`?)",
1807-
token::get_name(name).get());
1807+
&token::get_name(name)[]);
18081808
span_err!(self.session, import_span, E0254, "{}", &msg[]);
18091809
}
18101810
Some(_) | None => {}
@@ -1826,7 +1826,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
18261826
if let Some(ref value) = *name_bindings.value_def.borrow() {
18271827
let msg = format!("import `{}` conflicts with value \
18281828
in this module",
1829-
token::get_name(name).get());
1829+
&token::get_name(name)[]);
18301830
span_err!(self.session, import_span, E0255, "{}", &msg[]);
18311831
if let Some(span) = value.value_span {
18321832
self.session.span_note(span,
@@ -1844,7 +1844,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
18441844
None => {
18451845
let msg = format!("import `{}` conflicts with type in \
18461846
this module",
1847-
token::get_name(name).get());
1847+
&token::get_name(name)[]);
18481848
span_err!(self.session, import_span, E0256, "{}", &msg[]);
18491849
if let Some(span) = ty.type_span {
18501850
self.session.span_note(span,
@@ -1866,7 +1866,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
18661866
_ => {
18671867
let msg = format!("import `{}` conflicts with existing \
18681868
submodule",
1869-
token::get_name(name).get());
1869+
&token::get_name(name)[]);
18701870
span_err!(self.session, import_span, E0258, "{}", &msg[]);
18711871
if let Some(span) = ty.type_span {
18721872
self.session.span_note(span,
@@ -1892,7 +1892,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
18921892
span_err!(self.session, span, E0259,
18931893
"an external crate named `{}` has already \
18941894
been imported into this module",
1895-
token::get_name(name).get());
1895+
&token::get_name(name)[]);
18961896
}
18971897
}
18981898

@@ -1906,7 +1906,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
19061906
"the name `{}` conflicts with an external \
19071907
crate that has been imported into this \
19081908
module",
1909-
token::get_name(name).get());
1909+
&token::get_name(name)[]);
19101910
}
19111911
}
19121912

@@ -1955,7 +1955,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
19551955
let module_name = self.module_to_string(&*search_module);
19561956
let mut span = span;
19571957
let msg = if "???" == &module_name[] {
1958-
span.hi = span.lo + Pos::from_usize(segment_name.get().len());
1958+
span.hi = span.lo + Pos::from_usize(segment_name.len());
19591959

19601960
match search_parent_externals(name,
19611961
&self.current_module) {
@@ -2368,11 +2368,11 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
23682368
let mut containing_module;
23692369
let mut i;
23702370
let first_module_path_string = token::get_name(module_path[0]);
2371-
if "self" == first_module_path_string.get() {
2371+
if "self" == &first_module_path_string[] {
23722372
containing_module =
23732373
self.get_nearest_normal_module_parent_or_self(module_);
23742374
i = 1;
2375-
} else if "super" == first_module_path_string.get() {
2375+
} else if "super" == &first_module_path_string[] {
23762376
containing_module =
23772377
self.get_nearest_normal_module_parent_or_self(module_);
23782378
i = 0; // We'll handle `super` below.
@@ -2383,7 +2383,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
23832383
// Now loop through all the `super`s we find.
23842384
while i < module_path.len() {
23852385
let string = token::get_name(module_path[i]);
2386-
if "super" != string.get() {
2386+
if "super" != &string[] {
23872387
break
23882388
}
23892389
debug!("(resolving module prefix) resolving `super` at {}",
@@ -2417,7 +2417,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
24172417
allow_private_imports: bool)
24182418
-> ResolveResult<(Target, bool)> {
24192419
debug!("(resolving name in module) resolving `{}` in `{}`",
2420-
token::get_name(name).get(),
2420+
&token::get_name(name)[],
24212421
self.module_to_string(&*module_));
24222422

24232423
// First, check the direct children of the module.
@@ -2493,7 +2493,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
24932493

24942494
// We're out of luck.
24952495
debug!("(resolving name in module) failed to resolve `{}`",
2496-
token::get_name(name).get());
2496+
&token::get_name(name)[]);
24972497
return Failed(None);
24982498
}
24992499

@@ -4372,7 +4372,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
43724372

43734373
let mut smallest = 0;
43744374
for (i, other) in maybes.iter().enumerate() {
4375-
values[i] = lev_distance(name, other.get());
4375+
values[i] = lev_distance(name, &other[]);
43764376

43774377
if values[i] <= values[smallest] {
43784378
smallest = i;
@@ -4383,9 +4383,9 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
43834383
values[smallest] != uint::MAX &&
43844384
values[smallest] < name.len() + 2 &&
43854385
values[smallest] <= max_distance &&
4386-
name != maybes[smallest].get() {
4386+
name != &maybes[smallest][] {
43874387

4388-
Some(maybes[smallest].get().to_string())
4388+
Some(maybes[smallest].to_string())
43894389

43904390
} else {
43914391
None
@@ -4475,7 +4475,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
44754475
false // Stop advancing
44764476
});
44774477

4478-
if method_scope && token::get_name(self.self_name).get()
4478+
if method_scope && &token::get_name(self.self_name)[]
44794479
== path_name {
44804480
self.resolve_error(
44814481
expr.span,

0 commit comments

Comments
 (0)