rustc: Move crate directives over to interior vectors

2 files changed, 8 insertions, 9 deletions

diff --git a/src/comp/syntax/parse/eval.rs b/src/comp/syntax/parse/eval.rs
index ca26e9f8128..d3806454b06 100644
--- a/src/comp/syntax/parse/eval.rs
+++ b/src/comp/syntax/parse/eval.rs
@@ -24,7 +24,7 @@ type ctx =
          mutable uint chpos,
          ast::crate_cfg cfg);
 
-fn eval_crate_directives(ctx cx, vec[@ast::crate_directive] cdirs,
+fn eval_crate_directives(ctx cx, &(@ast::crate_directive)[] cdirs,
                          str prefix, &mutable vec[@ast::view_item] view_items,
                          &mutable vec[@ast::item] items) {
     for (@ast::crate_directive sub_cdir in cdirs) {
@@ -32,9 +32,8 @@ fn eval_crate_directives(ctx cx, vec[@ast::crate_directive] cdirs,
     }
 }
 
-fn eval_crate_directives_to_mod(ctx cx,
-                                vec[@ast::crate_directive] cdirs, str prefix)
-   -> ast::_mod {
+fn eval_crate_directives_to_mod(ctx cx, &(@ast::crate_directive)[] cdirs,
+                                str prefix) -> ast::_mod {
     let vec[@ast::view_item] view_items = [];
     let vec[@ast::item] items = [];
     eval_crate_directives(cx, cdirs, prefix, view_items, items);
diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs
index a9189900470..78e9ec160ed 100644
--- a/src/comp/syntax/parse/parser.rs
+++ b/src/comp/syntax/parse/parser.rs
@@ -2338,7 +2338,7 @@ fn parse_crate_from_source_file(&str input, &ast::crate_cfg cfg,
     auto first_item_outer_attrs = crate_attrs._1;
     auto m = parse_mod_items(p, token::EOF,
                              first_item_outer_attrs);
-    ret @spanned(lo, p.get_lo_pos(), rec(directives=[],
+    ret @spanned(lo, p.get_lo_pos(), rec(directives=~[],
                                          module=m,
                                          attrs=crate_attrs._0,
                                          config=p.get_cfg()));
@@ -2420,8 +2420,8 @@ fn parse_crate_directive(&parser p, &ast::attribute[] first_outer_attr)
 }
 
 fn parse_crate_directives(&parser p, token::token term,
-                          &ast::attribute[] first_outer_attr) ->
-   vec[@ast::crate_directive] {
+                          &ast::attribute[] first_outer_attr)
+        -> (@ast::crate_directive)[] {
 
     // This is pretty ugly. If we have an outer attribute then we can't accept
     // seeing the terminator next, so if we do see it then fail the same way
@@ -2430,10 +2430,10 @@ fn parse_crate_directives(&parser p, token::token term,
         expect_word(p, "mod");
     }
 
-    let vec[@ast::crate_directive] cdirs = [];
+    let (@ast::crate_directive)[] cdirs = ~[];
     while (p.peek() != term) {
         auto cdir = @parse_crate_directive(p, first_outer_attr);
-        vec::push(cdirs, cdir);
+        cdirs += ~[cdir];
     }
     ret cdirs;
 }