---

yaml
---
r: 48811
b: refs/heads/snap-stage3
c: 14df844
h: refs/heads/master
i:
  48809: 69e1859
  48807: a8d3b41
v: v3

Author: alexcrichton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 58209910bd70512e4a880bb25ed296dddc48e0b7
+refs/heads/snap-stage3: 14df8447445440794d363f6dc3fbb5220bb0a775
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/driver/driver.rs

@@ -132,15 +132,15 @@ pub fn build_configuration(sess: Session, +argv0: ~str, input: input) ->
 }
 
 // Convert strings provided as --cfg [cfgspec] into a crate_cfg
-fn parse_cfgspecs(cfgspecs: ~[~str],
-                  demitter: diagnostic::Emitter) -> ast::crate_cfg {
-    let mut meta = ~[];
+pub fn parse_cfgspecs(cfgspecs: ~[~str]) -> ast::crate_cfg {
+    // FIXME (#2399): It would be nice to use the parser to parse all
+    // varieties of meta_item here. At the moment we just support the
+    // meta_word variant.
+    let mut words = ~[];
     for cfgspecs.each |s| {
-        let sess = parse::new_parse_sess(Some(demitter));
-        let m = parse::parse_meta_from_source_str(~"cfgspec", @/*bad*/ copy *s, ~[], sess);
-        meta.push(m)
+        words.push(attr::mk_word_item(@/*bad*/copy *s));
     }
-    return meta;
+    return words;
 }
 
 pub enum input {
@@ -639,7 +639,7 @@ pub fn build_session_options(+binary: ~str,
     let addl_lib_search_paths =
         getopts::opt_strs(matches, ~"L")
         .map(|s| Path(*s));
-    let cfg = parse_cfgspecs(getopts::opt_strs(matches, ~"cfg"), demitter);
+    let cfg = parse_cfgspecs(getopts::opt_strs(matches, ~"cfg"));
     let test = opt_present(matches, ~"test");
     let android_cross_path = getopts::opt_maybe_str(
         matches, ~"android-cross-path");

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

@@ -498,12 +498,7 @@ fn check_item(i: @ast::item, cx: ty::ctxt) {
 // not traverse into subitems, since that is handled by the outer
 // lint visitor.
 fn item_stopping_visitor<E>(v: visit::vt<E>) -> visit::vt<E> {
-    visit::mk_vt(@visit::Visitor {visit_item: |_i, _e, _v| { },
-        .. **(ty_stopping_visitor(v))})
-}
-
-fn ty_stopping_visitor<E>(v: visit::vt<E>) -> visit::vt<E> {
-    visit::mk_vt(@visit::Visitor {visit_ty: |_t, _e, _v| { },.. **v})
+    visit::mk_vt(@visit::Visitor {visit_item: |_i, _e, _v| { },.. **v})
 }
 
 fn check_item_while_true(cx: ty::ctxt, it: @ast::item) {

branches/snap-stage3/src/librustc/middle/typeck/astconv.rs

@@ -54,7 +54,6 @@
 
 use core::prelude::*;
 
-use middle::const_eval;
 use middle::ty::{arg, field, substs};
 use middle::ty::{ty_param_substs_and_ty};
 use middle::ty;
@@ -413,29 +412,9 @@ pub fn ast_ty_to_ty<AC:AstConv, RS:region_scope + Copy + Durable>(
           }
         }
       }
-      ast::ty_fixed_length_vec(a_mt, e) => {
-        match const_eval::eval_const_expr_partial(tcx, e) {
-          Ok(ref r) => {
-            match *r {
-              const_eval::const_int(i) =>
-                ty::mk_evec(tcx, ast_mt_to_mt(self, rscope, a_mt),
-                            ty::vstore_fixed(i as uint)),
-              const_eval::const_uint(i) =>
-                ty::mk_evec(tcx, ast_mt_to_mt(self, rscope, a_mt),
-                            ty::vstore_fixed(i as uint)),
-              _ => {
-                tcx.sess.span_fatal(
-                    ast_ty.span, ~"expected constant expr for vector length");
-              }
-            }
-          }
-          Err(ref r) => {
-            tcx.sess.span_fatal(
-                ast_ty.span,
-                fmt!("expected constant expr for vector length: %s",
-                     *r));
-          }
-        }
+      ast::ty_fixed_length_vec(a_mt, u) => {
+        ty::mk_evec(tcx, ast_mt_to_mt(self, rscope, a_mt),
+                    ty::vstore_fixed(u))
       }
       ast::ty_infer => {
         // ty_infer should only appear as the type of arguments or return

branches/snap-stage3/src/librustc/middle/typeck/check/mod.rs

@@ -2169,7 +2169,7 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,
           }
           ast::expr_repeat(element, count_expr, mutbl) => {
             let count = ty::eval_repeat_count(tcx, count_expr);
-            check_expr_with_hint(fcx, count_expr, ty::mk_uint(tcx));
+            fcx.write_ty(count_expr.id, ty::mk_uint(tcx));
             let tt = ast_expr_vstore_to_vstore(fcx, ev, count, vst);
             let t: ty::t = fcx.infcx().next_ty_var();
             bot |= check_expr_has_type(fcx, element, t);
@@ -2537,7 +2537,7 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,
       }
       ast::expr_repeat(element, count_expr, mutbl) => {
         let count = ty::eval_repeat_count(tcx, count_expr);
-        check_expr_with_hint(fcx, count_expr, ty::mk_uint(tcx));
+        fcx.write_ty(count_expr.id, ty::mk_uint(tcx));
         let t: ty::t = fcx.infcx().next_ty_var();
         bot |= check_expr_has_type(fcx, element, t);
         let t = ty::mk_evec(tcx, ty::mt {ty: t, mutbl: mutbl},

branches/snap-stage3/src/libsyntax/ast.rs

@@ -386,6 +386,7 @@ pub enum vstore {
 #[auto_decode]
 #[deriving_eq]
 pub enum expr_vstore {
+    // FIXME (#3469): Change uint to @expr (actually only constant exprs)
     expr_vstore_fixed(Option<uint>),   // [1,2,3,4]
     expr_vstore_uniq,                  // ~[1,2,3,4]
     expr_vstore_box,                   // @[1,2,3,4]
@@ -915,7 +916,7 @@ pub enum ty_ {
     ty_box(mt),
     ty_uniq(mt),
     ty_vec(mt),
-    ty_fixed_length_vec(mt, @expr),
+    ty_fixed_length_vec(mt, uint),
     ty_ptr(mt),
     ty_rptr(Option<@Lifetime>, mt),
     ty_closure(@TyClosure),

branches/snap-stage3/src/libsyntax/ext/expand.rs

@@ -456,6 +456,11 @@ pub fn core_macros() -> ~str {
             if !$cond {
                 ::core::sys::fail_assert(stringify!($cond), file!(), line!())
             }
+        };
+        ($cond:expr, $msg:expr) => {
+            if !$cond {
+                ::core::sys::fail_assert($msg, file!(), line!())
+            }
         }
     )
 

branches/snap-stage3/src/libsyntax/fold.rs

@@ -622,10 +622,10 @@ pub fn noop_fold_ty(t: &ty_, fld: @ast_fold) -> ty_ {
         }
         ty_tup(ref tys) => ty_tup(tys.map(|ty| fld.fold_ty(*ty))),
         ty_path(path, id) => ty_path(fld.fold_path(path), fld.new_id(id)),
-        ty_fixed_length_vec(ref mt, e) => {
+        ty_fixed_length_vec(ref mt, vs) => {
             ty_fixed_length_vec(
                 fold_mt(mt, fld),
-                fld.fold_expr(e)
+                vs
             )
         }
         ty_mac(ref mac) => ty_mac(fold_mac(*mac))

branches/snap-stage3/src/libsyntax/parse/mod.rs

@@ -139,22 +139,6 @@ pub fn parse_item_from_source_str(
     maybe_aborted(p.parse_item(attrs),p)
 }
 
-pub fn parse_meta_from_source_str(
-    name: ~str,
-    source: @~str,
-    +cfg: ast::crate_cfg,
-    sess: @mut ParseSess
-) -> @ast::meta_item {
-    let p = new_parser_from_source_str(
-        sess,
-        cfg,
-        /*bad*/ copy name,
-        codemap::FssNone,
-        source
-    );
-    maybe_aborted(p.parse_meta_item(),p)
-}
-
 pub fn parse_stmt_from_source_str(
     name: ~str,
     source: @~str,

branches/snap-stage3/src/libsyntax/parse/parser.rs

@@ -642,8 +642,7 @@ pub impl Parser {
                 self.obsolete(*self.last_span, ObsoleteMutVector);
             }
 
-            // Parse the `* e` in `[ int * e ]`
-            // where `e` is a const expression
+            // Parse the `* 3` in `[ int * 3 ]`
             let t = match self.maybe_parse_fixed_vstore_with_star() {
                 None => ty_vec(mt),
                 Some(suffix) => ty_fixed_length_vec(mt, suffix)
@@ -815,9 +814,23 @@ pub impl Parser {
         })
     }
 
-    fn maybe_parse_fixed_vstore_with_star(&self) -> Option<@ast::expr> {
+    fn maybe_parse_fixed_vstore_with_star(&self) -> Option<uint> {
         if self.eat(&token::BINOP(token::STAR)) {
-            Some(self.parse_expr())
+            match *self.token {
+                token::LIT_INT_UNSUFFIXED(i) if i >= 0i64 => {
+                    self.bump();
+                    Some(i as uint)
+                }
+                _ => {
+                    self.fatal(
+                        fmt!(
+                            "expected integral vector length \
+                            but found `%s`",
+                            token_to_str(self.reader, &copy *self.token)
+                        )
+                    );
+                }
+            }
         } else {
             None
         }

branches/snap-stage3/src/libsyntax/print/pprust.rs

@@ -425,7 +425,7 @@ pub fn print_type_ex(s: @ps, &&ty: @ast::Ty, print_colons: bool) {
         }
         print_type(s, mt.ty);
         word(s.s, ~" * ");
-        print_expr(s, v);
+        word(s.s, fmt!("%u", v));
         word(s.s, ~"]");
       }
       ast::ty_mac(_) => {

branches/snap-stage3/src/libsyntax/visit.rs

@@ -246,10 +246,7 @@ pub fn visit_ty<E>(t: @Ty, e: E, v: vt<E>) {
             (v.visit_ty)(f.decl.output, e, v);
         },
         ty_path(p, _) => visit_path(p, e, v),
-        ty_fixed_length_vec(ref mt, ex) => {
-            (v.visit_ty)(mt.ty, e, v);
-            (v.visit_expr)(ex, e, v);
-        },
+        ty_fixed_length_vec(ref mt, _) => (v.visit_ty)(mt.ty, e, v),
         ty_nil | ty_bot | ty_mac(_) | ty_infer => ()
     }
 }

branches/snap-stage3/src/test/compile-fail/non-constant-expr-for-fixed-len-vec.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,11 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Check that constant expressions can be used in vec repeat syntax. 
+// error-pattern:custom message
 
 fn main() {
-
-    const FOO: int = 2;
-    let _v = [0, ..FOO*3*2/2];
-
+    fail_unless!(false, "custom message");
 }