Box AST idents

1 files changed, 18 insertions, 18 deletions

diff --git a/src/rustc/metadata/creader.rs b/src/rustc/metadata/creader.rs
index 3356e8cdd65..fbb6a18edcd 100644
--- a/src/rustc/metadata/creader.rs
+++ b/src/rustc/metadata/creader.rs
@@ -42,7 +42,7 @@ fn read_crates(diag: span_handler, crate: ast::crate,
 type cache_entry = {
     cnum: int,
     span: span,
-    hash: str,
+    hash: @str,
     metas: @[@ast::meta_item]
 };
 
@@ -53,7 +53,7 @@ fn dump_crates(crate_cache: dvec<cache_entry>) {
         #debug("span: %?", entry.span);
         #debug("hash: %?", entry.hash);
         let attrs = [
-            attr::mk_attr(attr::mk_list_item("link", *entry.metas))
+            attr::mk_attr(attr::mk_list_item(@"link", *entry.metas))
         ];
         for attr::find_linkage_attrs(attrs).each {|attr|
             #debug("meta: %s", pprust::attr_to_str(attr));
@@ -81,11 +81,11 @@ fn warn_if_multiple_versions(diag: span_handler,
 
         if matches.len() != 1u {
             diag.handler().warn(
-                #fmt("using multiple versions of crate `%s`", name));
+                #fmt("using multiple versions of crate `%s`", *name));
             for matches.each {|match|
                 diag.span_note(match.span, "used here");
                 let attrs = [
-                    attr::mk_attr(attr::mk_list_item("link", *match.metas))
+                    attr::mk_attr(attr::mk_list_item(@"link", *match.metas))
                 ];
                 loader::note_linkage_attrs(diag, attrs);
             }
@@ -129,7 +129,7 @@ fn visit_item(e: env, i: @ast::item) {
         let native_name =
             alt attr::first_attr_value_str_by_name(i.attrs, "link_name") {
               some(nn) {
-                if nn == "" {
+                if *nn == "" {
                     e.diag.span_fatal(
                         i.span,
                         "empty #[link_name] not allowed; use #[nolink].");
@@ -140,17 +140,17 @@ fn visit_item(e: env, i: @ast::item) {
             };
         let mut already_added = false;
         if vec::len(attr::find_attrs_by_name(i.attrs, "nolink")) == 0u {
-            already_added = !cstore::add_used_library(cstore, native_name);
+            already_added = !cstore::add_used_library(cstore, *native_name);
         }
         let link_args = attr::find_attrs_by_name(i.attrs, "link_args");
         if vec::len(link_args) > 0u && already_added {
-            e.diag.span_fatal(i.span, "library '" + native_name +
+            e.diag.span_fatal(i.span, "library '" + *native_name +
                               "' already added: can't specify link_args.");
         }
         for link_args.each {|a|
             alt attr::get_meta_item_value_str(attr::attr_meta(a)) {
               some(linkarg) {
-                cstore::add_used_link_args(cstore, linkarg);
+                cstore::add_used_link_args(cstore, *linkarg);
               }
               none {/* fallthrough */ }
             }
@@ -160,11 +160,11 @@ fn visit_item(e: env, i: @ast::item) {
     }
 }
 
-fn metas_with(ident: ast::ident, key: str,
+fn metas_with(ident: ast::ident, key: ast::ident,
                     metas: [@ast::meta_item]) -> [@ast::meta_item] {
-    let name_items = attr::find_meta_items_by_name(metas, key);
+    let name_items = attr::find_meta_items_by_name(metas, *key);
     if name_items.is_empty() {
-        metas + [attr::mk_name_value_item_str(key, ident)]
+        metas + [attr::mk_name_value_item_str(key, *ident)]
     } else {
         metas
     }
@@ -172,7 +172,7 @@ fn metas_with(ident: ast::ident, key: str,
 
 fn metas_with_ident(ident: ast::ident,
                     metas: [@ast::meta_item]) -> [@ast::meta_item] {
-    metas_with(ident, "name", metas)
+    metas_with(ident, @"name", metas)
 }
 
 fn existing_match(e: env, metas: [@ast::meta_item], hash: str) ->
@@ -180,7 +180,7 @@ fn existing_match(e: env, metas: [@ast::meta_item], hash: str) ->
 
     for e.crate_cache.each {|c|
         if loader::metadata_matches(*c.metas, metas)
-            && (hash.is_empty() || c.hash == hash) {
+            && (hash.is_empty() || *c.hash == hash) {
             ret some(c.cnum);
         }
     }
@@ -226,7 +226,7 @@ fn resolve_crate(e: env, ident: ast::ident, metas: [@ast::meta_item],
               option::some(v) { v }
               option::none { ident }
             };
-        let cmeta = @{name: cname, data: cdata,
+        let cmeta = @{name: *cname, data: cdata,
                       cnum_map: cnum_map, cnum: cnum};
 
         let cstore = e.cstore;
@@ -249,10 +249,10 @@ fn resolve_crate_deps(e: env, cdata: @[u8]) -> cstore::cnum_map {
     for decoder::get_crate_deps(cdata).each {|dep|
         let extrn_cnum = dep.cnum;
         let cname = dep.name;
-        let cmetas = metas_with(dep.vers, "vers", []);
+        let cmetas = metas_with(dep.vers, @"vers", []);
         #debug("resolving dep crate %s ver: %s hash: %s",
-               dep.name, dep.vers, dep.hash);
-        alt existing_match(e, metas_with_ident(cname, cmetas), dep.hash) {
+               *dep.name, *dep.vers, *dep.hash);
+        alt existing_match(e, metas_with_ident(cname, cmetas), *dep.hash) {
           some(local_cnum) {
             #debug("already have it");
             // We've already seen this crate
@@ -265,7 +265,7 @@ fn resolve_crate_deps(e: env, cdata: @[u8]) -> cstore::cnum_map {
             // #2404
             let fake_span = ast_util::dummy_sp();
             let local_cnum =
-                resolve_crate(e, cname, cmetas, dep.hash, fake_span);
+                resolve_crate(e, cname, cmetas, *dep.hash, fake_span);
             cnum_map.insert(extrn_cnum, local_cnum);
           }
         }