Move the world over to using the new style string literals and types. Closes #2907.

1 files changed, 17 insertions, 17 deletions

diff --git a/src/rustc/metadata/creader.rs b/src/rustc/metadata/creader.rs
index 09713da9c74..28022a37320 100644
--- a/src/rustc/metadata/creader.rs
+++ b/src/rustc/metadata/creader.rs
@@ -38,7 +38,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]
 };
 
@@ -49,7 +49,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));
@@ -79,9 +79,9 @@ fn warn_if_multiple_versions(diag: span_handler,
             diag.handler().warn(
                 #fmt("using multiple versions of crate `%s`", *name));
             for matches.each |match| {
-                diag.span_note(match.span, "used here");
+                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);
             }
@@ -103,7 +103,7 @@ fn visit_view_item(e: env, i: @ast::view_item) {
     alt i.node {
       ast::view_item_use(ident, meta_items, id) {
         #debug("resolving use stmt. ident: %?, meta: %?", ident, meta_items);
-        let cnum = resolve_crate(e, ident, meta_items, "", i.span);
+        let cnum = resolve_crate(e, ident, meta_items, ~"", i.span);
         cstore::add_use_stmt_cnum(e.cstore, id, cnum);
       }
       _ { }
@@ -123,25 +123,25 @@ fn visit_item(e: env, i: @ast::item) {
 
         let cstore = e.cstore;
         let foreign_name =
-            alt attr::first_attr_value_str_by_name(i.attrs, "link_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].");
+                        ~"empty #[link_name] not allowed; use #[nolink].");
                 }
                 nn
               }
               none { i.ident }
             };
         let mut already_added = false;
-        if vec::len(attr::find_attrs_by_name(i.attrs, "nolink")) == 0u {
+        if vec::len(attr::find_attrs_by_name(i.attrs, ~"nolink")) == 0u {
             already_added = !cstore::add_used_library(cstore, *foreign_name);
         }
-        let link_args = attr::find_attrs_by_name(i.attrs, "link_args");
+        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 '" + *foreign_name +
-                              "' already added: can't specify link_args.");
+            e.diag.span_fatal(i.span, ~"library '" + *foreign_name +
+                              ~"' already added: can't specify link_args.");
         }
         for link_args.each |a| {
             alt attr::get_meta_item_value_str(attr::attr_meta(a)) {
@@ -168,10 +168,10 @@ fn metas_with(ident: ast::ident, key: ast::ident,
 
 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) ->
+fn existing_match(e: env, metas: ~[@ast::meta_item], hash: ~str) ->
     option<int> {
 
     for e.crate_cache.each |c| {
@@ -184,7 +184,7 @@ fn existing_match(e: env, metas: ~[@ast::meta_item], hash: str) ->
 }
 
 fn resolve_crate(e: env, ident: ast::ident, metas: ~[@ast::meta_item],
-                 hash: str, span: span) -> ast::crate_num {
+                 hash: ~str, span: span) -> ast::crate_num {
     let metas = metas_with_ident(ident, metas);
 
     alt existing_match(e, metas, hash) {
@@ -218,7 +218,7 @@ fn resolve_crate(e: env, ident: ast::ident, metas: ~[@ast::meta_item],
         let cnum_map = resolve_crate_deps(e, cdata);
 
         let cname =
-            alt attr::last_meta_item_value_str_by_name(metas, "name") {
+            alt attr::last_meta_item_value_str_by_name(metas, ~"name") {
               option::some(v) { v }
               option::none { ident }
             };
@@ -245,7 +245,7 @@ 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) {