---

yaml
---
r: 3854
b: refs/heads/master
c: a190a2c
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12d553216663b80a6c10921ab52558253ba56920
+refs/heads/master: a190a2c68eb0606b4617bea999796ea9a9ae06a6

trunk/src/comp/back/link.rs

@@ -286,28 +286,28 @@ fn build_link_meta(&session::session sess, &ast::crate c,
 
     type provided_metas = rec(option::t[str] name,
                               option::t[str] vers,
-                              vec[@ast::meta_item] cmh_items);
+                              (@ast::meta_item)[] cmh_items);
 
     fn provided_link_metas(&session::session sess,
                            &ast::crate c) -> provided_metas {
         let option::t[str] name = none;
         let option::t[str] vers = none;
-        let vec[@ast::meta_item] cmh_items = [];
+        let (@ast::meta_item)[] cmh_items = ~[];
         auto linkage_metas = attr::find_linkage_metas(c.node.attrs);
         attr::require_unique_names(sess, linkage_metas);
         for (@ast::meta_item meta in linkage_metas) {
             if (attr::get_meta_item_name(meta) == "name") {
                 alt (attr::get_meta_item_value_str(meta)) {
                     case (some(?v)) { name = some(v); }
-                    case (none) { cmh_items += [meta]; }
+                    case (none) { cmh_items += ~[meta]; }
                 }
             } else if (attr::get_meta_item_name(meta) == "vers") {
                 alt (attr::get_meta_item_value_str(meta)) {
                     case (some(?v)) { vers = some(v); }
-                    case (none) { cmh_items += [meta]; }
+                    case (none) { cmh_items += ~[meta]; }
                 }
             } else {
-                cmh_items += [meta];
+                cmh_items += ~[meta];
             }
         }
         ret rec(name = name,

trunk/src/comp/front/attr.rs

@@ -1,7 +1,6 @@
 // Functions dealing with attributes and meta_items
 
 import std::ivec;
-import std::vec;
 import std::str;
 import std::map;
 import std::option;
@@ -147,7 +146,7 @@ fn contains(&(@ast::meta_item)[] haystack, @ast::meta_item needle) -> bool {
 }
 
 // FIXME: This needs to sort by meta_item variant in addition to the item name
-fn sort_meta_items(&vec[@ast::meta_item] items) -> vec[@ast::meta_item] {
+fn sort_meta_items(&(@ast::meta_item)[] items) -> (@ast::meta_item)[] {
     fn lteq(&@ast::meta_item ma, &@ast::meta_item mb) -> bool {
         fn key(&@ast::meta_item m) -> ast::ident {
             alt (m.node) {
@@ -166,16 +165,16 @@ fn sort_meta_items(&vec[@ast::meta_item] items) -> vec[@ast::meta_item] {
     }
 
     // This is sort of stupid here, converting to a vec of mutables and back
-    let vec[mutable @ast::meta_item] v = [mutable ];
+    let (@ast::meta_item)[mutable] v = ~[mutable];
     for (@ast::meta_item mi in items) {
-        v += [mutable mi];
+        v += ~[mutable mi];
     }
 
-    std::sort::quick_sort(lteq, v);
+    std::sort::ivector::quick_sort(lteq, v);
 
-    let vec[@ast::meta_item] v2 = [];
+    let (@ast::meta_item)[] v2 = ~[];
     for (@ast::meta_item mi in v) {
-        v2 += [mi]
+        v2 += ~[mi];
     }
     ret v2;
 }