---

yaml
---
r: 96151
b: refs/heads/dist-snap
c: 35e6c02
h: refs/heads/master
i:
  96149: dd5ce50
  96147: 3dfe2d6
  96143: a7be03c
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 9062988610dc28201c552854a2363157fc297fa5
+refs/heads/dist-snap: 35e6c0252422b178cc3b21f7f1510c80bcd064c8
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/trans/controlflow.rs

@@ -14,7 +14,6 @@ use middle::trans::base::*;
 use middle::trans::build::*;
 use middle::trans::callee;
 use middle::trans::common::*;
-use middle::trans::debuginfo;
 use middle::trans::expr;
 use middle::ty;
 use util::common::indenter;
@@ -76,7 +75,6 @@ pub fn trans_if(bcx: @mut Block,
             // if true { .. } [else { .. }]
             return do with_scope(bcx, thn.info(), "if_true_then") |bcx| {
                 let bcx_out = trans_block(bcx, thn, dest);
-                debuginfo::clear_source_location(bcx.fcx);
                 trans_block_cleanups(bcx_out, block_cleanups(bcx))
             }
         } else {
@@ -88,7 +86,6 @@ pub fn trans_if(bcx: @mut Block,
                 Some(elexpr) => {
                     return do with_scope(bcx, elexpr.info(), "if_false_then") |bcx| {
                         let bcx_out = trans_if_else(bcx, elexpr, dest);
-                        debuginfo::clear_source_location(bcx.fcx);
                         trans_block_cleanups(bcx_out, block_cleanups(bcx))
                     }
                 }
@@ -101,8 +98,6 @@ pub fn trans_if(bcx: @mut Block,
     let then_bcx_in = scope_block(bcx, thn.info(), "then");
 
     let then_bcx_out = trans_block(then_bcx_in, thn, dest);
-
-    debuginfo::clear_source_location(bcx.fcx);
     let then_bcx_out = trans_block_cleanups(then_bcx_out,
                                             block_cleanups(then_bcx_in));
 
@@ -127,9 +122,6 @@ pub fn trans_if(bcx: @mut Block,
     debug!("then_bcx_in={}, else_bcx_in={}",
            then_bcx_in.to_str(), else_bcx_in.to_str());
 
-    // Clear the source location because it is still set to whatever has been translated
-    // right before.
-    debuginfo::clear_source_location(else_bcx_in.fcx);
     CondBr(bcx, cond_val, then_bcx_in.llbb, else_bcx_in.llbb);
     return next_bcx;
 
@@ -147,7 +139,6 @@ pub fn trans_if(bcx: @mut Block,
             // would be nice to have a constraint on ifs
             _ => else_bcx_in.tcx().sess.bug("strange alternative in if")
         };
-        debuginfo::clear_source_location(else_bcx_in.fcx);
         trans_block_cleanups(else_bcx_out, block_cleanups(else_bcx_in))
     }
 }

branches/dist-snap/src/librustc/middle/trans/debuginfo.rs

@@ -509,17 +509,6 @@ pub fn set_source_location(fcx: &FunctionContext,
     }
 }
 
-/// Clears the current debug location.
-///
-/// Instructions generated hereafter won't be assigned a source location.
-pub fn clear_source_location(fcx: &FunctionContext) {
-    if fn_should_be_ignored(fcx) {
-        return;
-    }
-
-    set_debug_location(fcx.ccx, UnknownLocation);
-}
-
 /// Enables emitting source locations for the given functions.
 ///
 /// Since we don't want source locations to be emitted for the function prelude, they are disabled

branches/dist-snap/src/libsyntax/parse/obsolete.rs

@@ -39,6 +39,8 @@ pub enum ObsoleteSyntax {
     ObsoleteConstPointer,
     ObsoleteEmptyImpl,
     ObsoleteLoopAsContinue,
+    ObsoleteEnumWildcard,
+    ObsoleteStructWildcard
 }
 
 impl to_bytes::IterBytes for ObsoleteSyntax {
@@ -113,6 +115,14 @@ impl ParserObsoleteMethods for Parser {
                 "`loop` is now only used for loops and `continue` is used for \
                  skipping iterations"
             ),
+            ObsoleteEnumWildcard => (
+                "enum wildcard",
+                "use `..` instead of `*` for matching all enum fields"
+            ),
+            ObsoleteStructWildcard => (
+                "struct wildcard",
+                "use `..` instead of `_` for matching trailing struct fields"
+            ),
         };
 
         self.report(sp, kind, kind_str, desc);

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

@@ -2755,7 +2755,12 @@ impl Parser {
             if first { first = false; }
             else { self.expect(&token::COMMA); }
 
+            etc = *self.token == token::UNDERSCORE || *self.token == token::DOTDOT;
             if *self.token == token::UNDERSCORE {
+                // FIXME #5830 activate after snapshot
+                // self.obsolete(*self.span, ObsoleteStructWildcard);
+            }
+            if etc {
                 self.bump();
                 if *self.token != token::RBRACE {
                     self.fatal(
@@ -3016,9 +3021,19 @@ impl Parser {
                                     _ => false,
                                 }
                             };
-                            if is_star {
+                            let is_dotdot = do self.look_ahead(1) |t| {
+                                match *t {
+                                    token::DOTDOT => true,
+                                    _ => false,
+                                }
+                            };
+                            if is_star | is_dotdot {
                                 // This is a "top constructor only" pat
                                 self.bump();
+                                if is_star {
+                                    // FIXME #5830 activate after snapshot
+                                    // self.obsolete(*self.span, ObsoleteEnumWildcard);
+                                }
                                 self.bump();
                                 self.expect(&token::RPAREN);
                                 pat = PatEnum(enum_path, None);

branches/dist-snap/src/test/run-pass/ignore-all-the-things.rs

@@ -0,0 +1,44 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+struct Foo(int, int, int, int);
+struct Bar{a: int, b: int, c: int, d: int}
+
+pub fn main() {
+    let Foo(..) = Foo(5, 5, 5, 5);
+    let Foo(*) = Foo(5, 5, 5, 5);
+    let Bar{..} = Bar{a: 5, b: 5, c: 5, d: 5};
+    let Bar{_} = Bar{a: 5, b: 5, c: 5, d: 5};
+    //let (..) = (5, 5, 5, 5);
+    //let Foo(a, b, ..) = Foo(5, 5, 5, 5);
+    //let Foo(.., d) = Foo(5, 5, 5, 5);
+    //let (a, b, ..) = (5, 5, 5, 5);
+    //let (.., c, d) = (5, 5, 5, 5);
+    let Bar{b: b, ..} = Bar{a: 5, b: 5, c: 5, d: 5};
+    let Bar{b: b, _} = Bar{a: 5, b: 5, c: 5, d: 5};
+    /*match [5, 5, 5, 5] {
+        [a, ..] => { }
+    }*/
+    /*match [5, 5, 5, 5] {
+        [.., b] => { }
+    }*/
+    /*match [5, 5, 5, 5] {
+        [a, .., b] => { }
+    }*/
+    match [5, 5, 5] {
+        [a, .._] => { }
+    }
+    match [5, 5, 5] {
+        [.._, a] => { }
+    }
+    match [5, 5, 5] {
+        [a, .._, b] => { }
+    }
+}