---

yaml
---
r: 69630
b: refs/heads/auto
c: 887c656
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 44cb1c3adba18ae36441649f7264ecb834ea2502
+refs/heads/auto: 887c65697056b23be69b9b11f41637d07327626e
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/doc/tutorial.md

@@ -1455,7 +1455,7 @@ compiler needs assistance, though, the arguments and return types may be
 annotated.
 
 ~~~~
-let square = |x: int| -> uint { x * x as uint };
+let square = |x: int| -> uint { (x * x) as uint };
 ~~~~
 
 There are several forms of closure, each with its own role. The most

branches/auto/src/etc/vim/syntax/rust.vim

@@ -3,7 +3,7 @@
 " Maintainer:   Patrick Walton <[email protected]>
 " Maintainer:   Ben Blum <[email protected]>
 " Maintainer:   Chris Morgan <[email protected]>
-" Last Change:  2013 Aug 1
+" Last Change:  2013 Jul 10
 
 if version < 600
   syntax clear
@@ -17,7 +17,7 @@ syn keyword   rustOperator    as
 syn match     rustAssert      "\<assert\(\w\)*!" contained
 syn match     rustFail        "\<fail\(\w\)*!" contained
 syn keyword   rustKeyword     break copy do extern
-syn keyword   rustKeyword     foreach in if impl let log
+syn keyword   rustKeyword     for if impl let log
 syn keyword   rustKeyword     copy do extern
 syn keyword   rustKeyword     for impl let log
 syn keyword   rustKeyword     loop mod once priv pub
@@ -83,26 +83,12 @@ syn match     rustModPathSep  "::"
 syn match     rustFuncCall    "\w\(\w\)*("he=e-1,me=e-1
 syn match     rustFuncCall    "\w\(\w\)*::<"he=e-3,me=e-3 " foo::<T>();
 
-" This is merely a convention; note also the use of [A-Z], restricting it to
-" latin identifiers rather than the full Unicode uppercase. I have not used
-" [:upper:] as it depends upon 'noignorecase'
-"syn match     rustCapsIdent    display "[A-Z]\w\(\w\)*"
-
-syn match     rustOperator     display "\%(+\|-\|/\|*\|=\|\^\|&\||\|!\|>\|<\|%\)=\?"
-" This one isn't *quite* right, as we could have binary-& with a reference
-syn match     rustSigil        display /&\s\+[&~@*][^)= \t\r\n]/he=e-1,me=e-1
-syn match     rustSigil        display /[&~@*][^)= \t\r\n]/he=e-1,me=e-1
-" This isn't actually correct; a closure with no arguments can be `|| { }`.
-" Last, because the & in && isn't a sigil
-syn match     rustOperator     display "&&\|||"
-
 syn match     rustMacro       '\w\(\w\)*!' contains=rustAssert,rustFail
 syn match     rustMacro       '#\w\(\w\)*' contains=rustAssert,rustFail
 
 syn match     rustFormat      display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlLjzt]\|ll\|hh\)\=\([aAbdiuoxXDOUfFeEgGcCsSpn?]\|\[\^\=.[^]]*\]\)" contained
 syn match     rustFormat      display "%%" contained
-syn match     rustSpecial     display contained /\\\([nrt\\'"]\|x\x\{2}\|u\x\{4}\|U\x\{8}\)/
-syn region    rustString      start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=rustTodo,rustFormat,rustSpecial
+syn region    rustString      start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=rustTodo,rustFormat
 
 syn region    rustAttribute   start="#\[" end="\]" contains=rustString,rustDeriving
 syn region    rustDeriving    start="deriving(" end=")" contained contains=rustTrait
@@ -128,13 +114,13 @@ syn match     rustFloat       display "\<[0-9][0-9_]*\.[0-9_]\+\%([eE][+-]\=[0-9
 syn match     rustFloat       display "\<[0-9][0-9_]*\.[0-9_]\+\%([eE][+-]\=[0-9_]\+\)\(f\|f32\|f64\)\>"
 
 " For the benefit of delimitMate
-syn region rustLifetimeCandidate display start=/&'\%(\([^'\\]\|\\\(['nrt\\\"]\|x\x\{2}\|u\x\{4}\|U\x\{8}\)\)'\)\@!/ end=/[[:cntrl:][:space:][:punct:]]\@=\|$/ contains=rustSigil,rustLifetime
+syn region rustLifetimeCandidate display start=/&'\%(\([^'\\]\|\\\(['nrt\\\"]\|x\x\{2}\|u\x\{4}\|U\x\{8}\)\)'\)\@!/ end=/[[:cntrl:][:space:][:punct:]]\@=\|$/ contains=rustLifetime
 syn region rustGenericRegion display start=/<\%('\|[^[cntrl:][:space:][:punct:]]\)\@=')\S\@=/ end=/>/ contains=rustGenericLifetimeCandidate
-syn region rustGenericLifetimeCandidate display start=/\%(<\|,\s*\)\@<='/ end=/[[:cntrl:][:space:][:punct:]]\@=\|$/ contains=rustSigil,rustLifetime
+syn region rustGenericLifetimeCandidate display start=/\%(<\|,\s*\)\@<='/ end=/[[:cntrl:][:space:][:punct:]]\@=\|$/ contains=rustLifetime
 
 "rustLifetime must appear before rustCharacter, or chars will get the lifetime highlighting
 syn match     rustLifetime    display "\'\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*"
-syn match   rustCharacter   /'\([^'\\]\|\\\([nrt\\'"]\|x\x\{2}\|u\x\{4}\|U\x\{8}\)\)'/ contains=rustSpecial
+syn match   rustCharacter   "'\([^'\\]\|\\\(['nrt\\\"]\|x\x\{2}\|u\x\{4}\|U\x\{8}\)\)'"
 
 syn region    rustCommentML   start="/\*" end="\*/" contains=rustTodo
 syn region    rustComment     start="//" skip="\\$" end="$" contains=rustTodo keepend
@@ -154,9 +140,7 @@ hi def link rustBinNumber       rustNumber
 hi def link rustIdentifierPrime rustIdentifier
 hi def link rustTrait           rustType
 
-hi def link rustSigil         StorageClass
 hi def link rustFormat        Special
-hi def link rustSpecial       Special
 hi def link rustString        String
 hi def link rustCharacter     Character
 hi def link rustNumber        Number
@@ -168,7 +152,6 @@ hi def link rustOperator      Operator
 hi def link rustKeyword       Keyword
 hi def link rustConditional   Conditional
 hi def link rustIdentifier    Identifier
-hi def link rustCapsIdent     rustIdentifier
 hi def link rustModPath       Include
 hi def link rustModPathSep    Delimiter
 hi def link rustFuncName      Function

branches/auto/src/librustc/metadata/creader.rs

@@ -17,14 +17,14 @@ use metadata::filesearch::FileSearch;
 use metadata::loader;
 
 use std::hashmap::HashMap;
+use syntax::ast;
 use syntax::attr;
 use syntax::attr::AttrMetaMethods;
 use syntax::codemap::{span, dummy_sp};
 use syntax::diagnostic::span_handler;
 use syntax::parse::token;
 use syntax::parse::token::ident_interner;
-use syntax::visit;
-use syntax::ast;
+use syntax::oldvisit;
 
 // Traverses an AST, reading all the information about use'd crates and extern
 // libraries necessary for later resolving, typechecking, linking, etc.
@@ -46,12 +46,12 @@ pub fn read_crates(diag: @span_handler,
         intr: intr
     };
     let v =
-        visit::mk_simple_visitor(@visit::SimpleVisitor {
+        oldvisit::mk_simple_visitor(@oldvisit::SimpleVisitor {
             visit_view_item: |a| visit_view_item(e, a),
             visit_item: |a| visit_item(e, a),
-            .. *visit::default_simple_visitor()});
+            .. *oldvisit::default_simple_visitor()});
     visit_crate(e, crate);
-    visit::visit_crate(crate, ((), v));
+    oldvisit::visit_crate(crate, ((), v));
     dump_crates(*e.crate_cache);
     warn_if_multiple_versions(e, diag, *e.crate_cache);
 }

branches/auto/src/librustc/metadata/encoder.rs

@@ -39,7 +39,7 @@ use syntax::attr;
 use syntax::attr::AttrMetaMethods;
 use syntax::diagnostic::span_handler;
 use syntax::parse::token::special_idents;
-use syntax::{ast_util, visit};
+use syntax::{ast_util, oldvisit};
 use syntax::parse::token;
 use syntax;
 use writer = extra::ebml::writer;
@@ -1199,12 +1199,12 @@ fn encode_info_for_items(ecx: &EncodeContext,
     // See comment in `encode_side_tables_for_ii` in astencode
     let ecx_ptr : *() = unsafe { cast::transmute(ecx) };
 
-    visit::visit_crate(crate, ((), visit::mk_vt(@visit::Visitor {
+    oldvisit::visit_crate(crate, ((), oldvisit::mk_vt(@oldvisit::Visitor {
         visit_expr: |_e, (_cx, _v)| { },
         visit_item: {
             let ebml_w = (*ebml_w).clone();
             |i, (cx, v)| {
-                visit::visit_item(i, (cx, v));
+                oldvisit::visit_item(i, (cx, v));
                 match items.get_copy(&i.id) {
                     ast_map::node_item(_, pt) => {
                         let mut ebml_w = ebml_w.clone();
@@ -1219,7 +1219,7 @@ fn encode_info_for_items(ecx: &EncodeContext,
         visit_foreign_item: {
             let ebml_w = (*ebml_w).clone();
             |ni, (cx, v)| {
-                visit::visit_foreign_item(ni, (cx, v));
+                oldvisit::visit_foreign_item(ni, (cx, v));
                 match items.get_copy(&ni.id) {
                     ast_map::node_foreign_item(_, abi, _, pt) => {
                         debug!("writing foreign item %s::%s",
@@ -1243,7 +1243,7 @@ fn encode_info_for_items(ecx: &EncodeContext,
                 }
             }
         },
-        ..*visit::default_visitor()
+        ..*oldvisit::default_visitor()
     })));
     ebml_w.end_tag();
     return /*bad*/(*index).clone();

branches/auto/src/librustc/middle/borrowck/check_loans.rs

@@ -27,7 +27,7 @@ use syntax::ast::{m_mutbl, m_imm, m_const};
 use syntax::ast;
 use syntax::ast_util;
 use syntax::codemap::span;
-use syntax::visit;
+use syntax::oldvisit;
 use util::ppaux::Repr;
 
 #[deriving(Clone)]
@@ -54,12 +54,14 @@ pub fn check_loans(bccx: @BorrowckCtxt,
         reported: @mut HashSet::new(),
     };
 
-    let vt = visit::mk_vt(@visit::Visitor {visit_expr: check_loans_in_expr,
-                                           visit_local: check_loans_in_local,
-                                           visit_block: check_loans_in_block,
-                                           visit_pat: check_loans_in_pat,
-                                           visit_fn: check_loans_in_fn,
-                                           .. *visit::default_visitor()});
+    let vt = oldvisit::mk_vt(@oldvisit::Visitor {
+        visit_expr: check_loans_in_expr,
+        visit_local: check_loans_in_local,
+        visit_block: check_loans_in_block,
+        visit_pat: check_loans_in_pat,
+        visit_fn: check_loans_in_fn,
+        .. *oldvisit::default_visitor()
+    });
     (vt.visit_block)(body, (clcx, vt));
 }
 
@@ -612,27 +614,27 @@ impl<'self> CheckLoanCtxt<'self> {
     }
 }
 
-fn check_loans_in_fn<'a>(fk: &visit::fn_kind,
+fn check_loans_in_fn<'a>(fk: &oldvisit::fn_kind,
                          decl: &ast::fn_decl,
                          body: &ast::Block,
                          sp: span,
                          id: ast::NodeId,
                          (this, visitor): (CheckLoanCtxt<'a>,
-                                           visit::vt<CheckLoanCtxt<'a>>)) {
+                                           oldvisit::vt<CheckLoanCtxt<'a>>)) {
     match *fk {
-        visit::fk_item_fn(*) |
-        visit::fk_method(*) => {
+        oldvisit::fk_item_fn(*) |
+        oldvisit::fk_method(*) => {
             // Don't process nested items.
             return;
         }
 
-        visit::fk_anon(*) |
-        visit::fk_fn_block(*) => {
+        oldvisit::fk_anon(*) |
+        oldvisit::fk_fn_block(*) => {
             check_captured_variables(this, id, sp);
         }
     }
 
-    visit::visit_fn(fk, decl, body, sp, id, (this, visitor));
+    oldvisit::visit_fn(fk, decl, body, sp, id, (this, visitor));
 
     fn check_captured_variables(this: CheckLoanCtxt,
                                 closure_id: ast::NodeId,
@@ -677,14 +679,14 @@ fn check_loans_in_fn<'a>(fk: &visit::fn_kind,
 
 fn check_loans_in_local<'a>(local: @ast::Local,
                             (this, vt): (CheckLoanCtxt<'a>,
-                                         visit::vt<CheckLoanCtxt<'a>>)) {
-    visit::visit_local(local, (this, vt));
+                                         oldvisit::vt<CheckLoanCtxt<'a>>)) {
+    oldvisit::visit_local(local, (this, vt));
 }
 
 fn check_loans_in_expr<'a>(expr: @ast::expr,
                            (this, vt): (CheckLoanCtxt<'a>,
-                                        visit::vt<CheckLoanCtxt<'a>>)) {
-    visit::visit_expr(expr, (this, vt));
+                                        oldvisit::vt<CheckLoanCtxt<'a>>)) {
+    oldvisit::visit_expr(expr, (this, vt));
 
     debug!("check_loans_in_expr(expr=%s)",
            expr.repr(this.tcx()));
@@ -737,17 +739,17 @@ fn check_loans_in_expr<'a>(expr: @ast::expr,
 
 fn check_loans_in_pat<'a>(pat: @ast::pat,
                           (this, vt): (CheckLoanCtxt<'a>,
-                                       visit::vt<CheckLoanCtxt<'a>>))
+                                       oldvisit::vt<CheckLoanCtxt<'a>>))
 {
     this.check_for_conflicting_loans(pat.id);
     this.check_move_out_from_id(pat.id, pat.span);
-    visit::visit_pat(pat, (this, vt));
+    oldvisit::visit_pat(pat, (this, vt));
 }
 
 fn check_loans_in_block<'a>(blk: &ast::Block,
                             (this, vt): (CheckLoanCtxt<'a>,
-                                         visit::vt<CheckLoanCtxt<'a>>))
+                                         oldvisit::vt<CheckLoanCtxt<'a>>))
 {
-    visit::visit_block(blk, (this, vt));
+    oldvisit::visit_block(blk, (this, vt));
     this.check_for_conflicting_loans(blk.id);
 }