---

yaml
---
r: 163691
b: refs/heads/snap-stage3
c: 10a862d
h: refs/heads/master
i:
  163689: 1034951
  163687: 002bcf6
v: v3

Author: eddyb

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 9146a919b616e39e528e4d7100d16eef52f1f852
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: f0276072a3ee4596cacda9b2155ca57a07ec0683
+refs/heads/snap-stage3: 10a862d4f48a183dec5621d2cd81e64701bd29c6
 refs/heads/try: 20cbbffeefc1f35e2ea63afce7b42fbd79611d42
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/librustc/metadata/encoder.rs

@@ -451,8 +451,6 @@ fn encode_reexported_static_methods(ecx: &EncodeContext,
                                     mod_path: PathElems,
                                     exp: &middle::resolve::Export) {
     if let Some(ast_map::NodeItem(item)) = ecx.tcx.map.find(exp.def_id.node) {
-        let original_name = token::get_ident(item.ident);
-
         let path_differs = ecx.tcx.map.with_path(exp.def_id.node, |path| {
             let (mut a, mut b) = (path, mod_path.clone());
             loop {
@@ -474,16 +472,16 @@ fn encode_reexported_static_methods(ecx: &EncodeContext,
         // encoded metadata for static methods relative to Bar,
         // but not yet for Foo.
         //
-        if path_differs || original_name.get() != exp.name {
+        if path_differs || item.ident.name != exp.name {
             if !encode_reexported_static_base_methods(ecx, rbml_w, exp) {
                 if encode_reexported_static_trait_methods(ecx, rbml_w, exp) {
                     debug!("(encode reexported static methods) {} [trait]",
-                           original_name);
+                           item.ident.name);
                 }
             }
             else {
                 debug!("(encode reexported static methods) {} [base]",
-                       original_name);
+                       item.ident.name);
             }
         }
     }
@@ -534,7 +532,7 @@ fn encode_reexports(ecx: &EncodeContext,
                 rbml_w.wr_str(def_to_string(exp.def_id).as_slice());
                 rbml_w.end_tag();
                 rbml_w.start_tag(tag_items_data_item_reexport_name);
-                rbml_w.wr_str(exp.name.as_slice());
+                rbml_w.wr_str(exp.name.as_str());
                 rbml_w.end_tag();
                 rbml_w.end_tag();
                 encode_reexported_static_methods(ecx, rbml_w, path.clone(), exp);

branches/snap-stage3/src/librustc/middle/resolve.rs

@@ -98,7 +98,7 @@ type BindingMap = HashMap<Name, BindingInfo>;
 pub type ExportMap = NodeMap<Vec<Export>>;
 
 pub struct Export {
-    pub name: String,        // The name of the target.
+    pub name: Name,          // The name of the target.
     pub def_id: DefId,       // The definition of the target.
 }
 
@@ -3873,11 +3873,10 @@ impl<'a> Resolver<'a> {
                                    ns: Namespace) {
         match namebindings.def_for_namespace(ns) {
             Some(d) => {
-                let name = token::get_name(name);
                 debug!("(computing exports) YES: export '{}' => {}",
                        name, d.def_id());
                 exports.push(Export {
-                    name: name.get().to_string(),
+                    name: name,
                     def_id: d.def_id()
                 });
             }