diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-07-07 15:31:03 -0700 |
|---|---|---|
| committer | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2017-07-28 15:46:23 +0200 |
| commit | 51bb31ad2551c0bf82a556792303ec1de5b76dbc (patch) | |
| tree | 0230874e4c16d0a2154a80faf9f54be166d43680 | |
| parent | cc40f58b8ba7019f52acd4e8da015ddd249db86a (diff) | |
| download | rust-51bb31ad2551c0bf82a556792303ec1de5b76dbc.tar.gz rust-51bb31ad2551c0bf82a556792303ec1de5b76dbc.zip | |
Fix tests
| -rw-r--r-- | src/liballoc/lib.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/generator/iterator-count.rs | 11 | ||||
| -rw-r--r-- | src/test/ui/resolve/token-error-correct.stderr | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 1252be447c3..6c852a13867 100644 --- a/src/liballoc/lib.rs +++ b/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)] diff --git a/src/test/run-pass/generator/iterator-count.rs b/src/test/run-pass/generator/iterator-count.rs index 52f82873d4c..c415ef2beb3 100644 --- a/src/test/run-pass/generator/iterator-count.rs +++ b/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)); } diff --git a/src/test/ui/resolve/token-error-correct.stderr b/src/test/ui/resolve/token-error-correct.stderr index 226fa6469bc..281c21f6f85 100644 --- a/src/test/ui/resolve/token-error-correct.stderr +++ b/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 |