---

bors · bors · commit fc5506cf0299 · 2015-08-15T19:10:40.000Z
yaml --- r: 233417 b: refs/heads/beta c: f05b22e h: refs/heads/master i: 233415: b9304d1 v: v3
diff --git a/[refs] b/[refs]
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: ea7768c2dd8089cc3c3dc1e27158cf1bed277308
+refs/heads/beta: f05b22efb5e739b92b47527d29c5fa903f7e64b6
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
diff --git a/branches/beta/src/libcore/iter.rs b/branches/beta/src/libcore/iter.rs
@@ -616,6 +616,8 @@ pub trait Iterator {
 
     /// Tests whether the predicate holds true for all elements in the iterator.
     ///
+    /// Does not consume the iterator past the first non-matching element.
+    ///
     /// # Examples
     ///
     /// ```
diff --git a/branches/beta/src/librustc_typeck/diagnostics.rs b/branches/beta/src/librustc_typeck/diagnostics.rs
@@ -2365,6 +2365,25 @@ struct Bar<S, T> { x: Foo<S, T> }
 ```
 "##,
 
+E0248: r##"
+This error indicates an attempt to use a value where a type is expected. For
+example:
+
+```
+enum Foo {
+    Bar(u32)
+}
+
+fn do_something(x: Foo::Bar) { }
+```
+
+In this example, we're attempting to take a type of `Foo::Bar` in the
+do_something function. This is not legal: `Foo::Bar` is a value of type `Foo`,
+not a distinct static type. Likewise, it's not legal to attempt to
+`impl Foo::Bar`: instead, you must `impl Foo` and then pattern match to specify
+behaviour for specific enum variants.
+"##,
+
 E0249: r##"
 This error indicates a constant expression for the array length was found, but
 it was not an integer (signed or unsigned) expression.
@@ -2756,7 +2775,6 @@ register_diagnostics! {
     E0245, // not a trait
     E0246, // invalid recursive type
     E0247, // found module name used as a type
-    E0248, // found value name used as a type
     E0319, // trait impls for defaulted traits allowed just for structs/enums
     E0320, // recursive overflow during dropck
     E0321, // extended coherence rules for defaulted traits violated
diff --git a/branches/beta/src/libsyntax/ext/expand.rs b/branches/beta/src/libsyntax/ext/expand.rs
@@ -385,16 +385,7 @@ pub fn expand_expr(e: P<ast::Expr>, fld: &mut MacroExpander) -> P<ast::Expr> {
             // expand <head>
             let head = fld.fold_expr(head);
 
-            // create an hygienic ident
-            let iter = {
-                let ident = fld.cx.ident_of("iter");
-                let new_ident = fresh_name(&ident);
-                let rename = (ident, new_ident);
-                let mut rename_list = vec![rename];
-                let mut rename_fld = IdentRenamer{ renames: &mut rename_list };
-
-                rename_fld.fold_ident(ident)
-            };
+            let iter = token::gensym_ident("iter");
 
             let pat_span = fld.new_span(pat.span);
             // `::std::option::Option::Some(<pat>) => <body>`
diff --git a/branches/beta/src/libsyntax/ext/tt/transcribe.rs b/branches/beta/src/libsyntax/ext/tt/transcribe.rs
@@ -305,7 +305,7 @@ pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan {
                             }
                             MatchedSeq(..) => {
                                 panic!(r.sp_diag.span_fatal(
-                                    r.cur_span, /* blame the macro writer */
+                                    sp, /* blame the macro writer */
                                     &format!("variable '{}' is still repeating at this depth",
                                             ident)));
                             }
diff --git a/branches/beta/src/test/parse-fail/macro-repeat.rs b/branches/beta/src/test/parse-fail/macro-repeat.rs
@@ -0,0 +1,19 @@
+// Copyright 2015 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.
+
+macro_rules! mac {
+    ( $($v:tt)* ) => (
+        $v  //~ ERROR still repeating at this depth
+    )
+}
+
+fn main() {
+    mac!(0);
+}
diff --git a/branches/beta/src/test/run-pass/issue-27639.rs b/branches/beta/src/test/run-pass/issue-27639.rs
@@ -0,0 +1,19 @@
+// Copyright 2015 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.
+
+// ignore-pretty
+
+fn main() {
+    const iter: i32 = 0;
+
+    for i in 1..10 {
+        println!("{}", i);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan {`
`305`	`305`	`}`
`306`	`306`	`MatchedSeq(..) => {`
`307`	`307`	`panic!(r.sp_diag.span_fatal(`
`308`		`- r.cur_span, /* blame the macro writer */`
	`308`	`+ sp, /* blame the macro writer */`
`309`	`309`	`&format!("variable '{}' is still repeating at this depth",`
`310`	`310`	`ident)));`
`311`	`311`	`}`