Fix tests

src/liballoc/lib.rs

@@ -82,6 +82,7 @@
 #![cfg_attr(not(test), feature(core_float))]
 #![cfg_attr(not(test), feature(exact_size_is_empty))]
 #![cfg_attr(not(test), feature(slice_rotate))]
+#![cfg_attr(not(test), feature(generator_trait))]
 #![cfg_attr(test, feature(rand, test))]
 #![feature(allow_internal_unstable)]
 #![feature(box_patterns)]
@@ -97,7 +98,6 @@
 #![feature(fundamental)]
 #![feature(fused)]
 #![feature(generic_param_attrs)]
-#![feature(generator_trait)]
 #![feature(i128_type)]
 #![feature(inclusive_range)]
 #![feature(lang_items)]

src/test/run-pass/generator/iterator-count.rs

@@ -26,19 +26,22 @@ impl<T: Generator<Return = ()>> Iterator for W<T> {
 }
 
 fn test() -> impl Generator<Return=(), Yield=u8> {
-    for i in 1..6 {
-        yield i
+    || {
+        for i in 1..6 {
+            yield i
+        }
     }
 }
 
 fn main() {
+    let start = 6;
     let end = 11;
 
-    let closure_test = |start| {
+    let closure_test = || {
         for i in start..end {
             yield i
         }
     };
 
-    assert!(W(test()).chain(W(closure_test(6))).eq(1..11));
+    assert!(W(test()).chain(W(closure_test)).eq(1..11));
 }

src/test/ui/resolve/token-error-correct.stderr

@@ -28,11 +28,11 @@ error: expected expression, found `;`
 14 |     foo(bar(;
    |             ^
 
-error: expected one of `)`, `,`, `.`, `<`, `?`, `break`, `continue`, `false`, `for`, `if`, `loop`, `match`, `move`, `return`, `true`, `unsafe`, `while`, or an operator, found `;`
+error: expected one of `)`, `,`, `.`, `<`, `?`, `break`, `continue`, `false`, `for`, `if`, `loop`, `match`, `move`, `return`, `true`, `unsafe`, `while`, `yield`, or an operator, found `;`
   --> $DIR/token-error-correct.rs:14:13
    |
 14 |     foo(bar(;
-   |             ^ expected one of 18 possible tokens here
+   |             ^ expected one of 19 possible tokens here
 
 error: expected expression, found `)`
   --> $DIR/token-error-correct.rs:23:1