---

birkenfeld · birkenfeld · commit 3361308edf43 · 2015-08-15T11:49:33.000+02:00
yaml --- r: 233412 b: refs/heads/beta c: 56f3282 h: refs/heads/master 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: 29455557aa48d1047f274e60703edf7813fe5b6b
+refs/heads/beta: 56f3282f31118c894a79d355f76765a2ca6b14ce
 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,25 +2365,6 @@ 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.
@@ -2775,6 +2756,7 @@ 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,7 +385,16 @@ pub fn expand_expr(e: P<ast::Expr>, fld: &mut MacroExpander) -> P<ast::Expr> {
             // expand <head>
             let head = fld.fold_expr(head);
 
-            let iter = token::gensym_ident("iter");
+            // 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 pat_span = fld.new_span(pat.span);
             // `::std::option::Option::Some(<pat>) => <body>`
diff --git a/branches/beta/src/test/run-pass/issue-27639.rs b/branches/beta/src/test/run-pass/issue-27639.rs
