Fix tests

diff --git a/src/test/run-pass/generator/control-flow.rs b/src/test/run-pass/generator/control-flow.rs
index d627e835c6303a92aee23fb385cc5e71da64366e..60a00b4e467569ebac0f00e18a7f86fdc70c3d20 100644 (file)
--- a/src/test/run-pass/generator/control-flow.rs
+++ b/src/test/run-pass/generator/control-flow.rs
@@ -10,15 +10,15 @@
 
 #![feature(generators, generator_trait)]
 
-use std::ops::{State, Generator};
+use std::ops::{GeneratorState, Generator};
 
 fn finish<T>(mut amt: usize, mut t: T) -> T::Return
     where T: Generator<Yield = ()>
 {
     loop {
         match t.resume() {
-            State::Yielded(()) => amt = amt.checked_sub(1).unwrap(),
-            State::Complete(ret) => {
+            GeneratorState::Yielded(()) => amt = amt.checked_sub(1).unwrap(),
+            GeneratorState::Complete(ret) => {
                 assert_eq!(amt, 0);
                 return ret
             }

diff --git a/src/test/run-pass/generator/iterator-count.rs b/src/test/run-pass/generator/iterator-count.rs
index 8de0e71b85796608f6800b156dd15e961eea67c9..9afe95f9e865cf957031b841b77cb4775a9db06c 100644 (file)
--- a/src/test/run-pass/generator/iterator-count.rs
+++ b/src/test/run-pass/generator/iterator-count.rs
@@ -10,7 +10,7 @@
 
 #![feature(generators, generator_trait, conservative_impl_trait)]
 
-use std::ops::{State, Generator};
+use std::ops::{GeneratorState, Generator};
 
 struct W<T>(T);
 
@@ -19,8 +19,8 @@ impl<T: Generator<Return = ()>> Iterator for W<T> {
 
     fn next(&mut self) -> Option<Self::Item> {
         match self.0.resume() {
-            State::Complete(..) => None,
-            State::Yielded(v) => Some(v),
+            GeneratorState::Complete(..) => None,
+            GeneratorState::Yielded(v) => Some(v),
         }
     }
 }

diff --git a/src/test/run-pass/generator/resume-after-return.rs b/src/test/run-pass/generator/resume-after-return.rs
index d5f81d5eecd2ef66a53a2b93c6dad9f22141ffbe..b2e2a3e7e9d5b558ebd5534615448e7fb2e373c7 100644 (file)
--- a/src/test/run-pass/generator/resume-after-return.rs
+++ b/src/test/run-pass/generator/resume-after-return.rs
@@ -10,7 +10,7 @@
 
 #![feature(generators, generator_trait)]
 
-use std::ops::{State, Generator};
+use std::ops::{GeneratorState, Generator};
 use std::panic;
 
 fn main() {
@@ -22,7 +22,7 @@ fn main() {
     };
 
     match foo.resume() {
-        State::Complete(()) => {}
+        GeneratorState::Complete(()) => {}
         s => panic!("bad state: {:?}", s),
     }
 

diff --git a/src/test/run-pass/generator/smoke.rs b/src/test/run-pass/generator/smoke.rs
index 21c7b434d2a8cfdfa2442184d58df3415361f6e1..48f1b688f2466470e5067d3b12db1117d5945ff0 100644 (file)
--- a/src/test/run-pass/generator/smoke.rs
+++ b/src/test/run-pass/generator/smoke.rs
@@ -12,7 +12,7 @@
 
 #![feature(generators, generator_trait)]
 
-use std::ops::{State, Generator};
+use std::ops::{GeneratorState, Generator};
 use std::thread;
 
 #[test]
@@ -24,7 +24,7 @@ fn simple() {
     };
 
     match foo.resume() {
-        State::Complete(()) => {}
+        GeneratorState::Complete(()) => {}
         s => panic!("bad state: {:?}", s),
     }
 }
@@ -40,7 +40,7 @@ fn return_capture() {
     };
 
     match foo.resume() {
-        State::Complete(ref s) if *s == "foo" => {}
+        GeneratorState::Complete(ref s) if *s == "foo" => {}
         s => panic!("bad state: {:?}", s),
     }
 }
@@ -52,11 +52,11 @@ fn simple_yield() {
     };
 
     match foo.resume() {
-        State::Yielded(()) => {}
+        GeneratorState::Yielded(()) => {}
         s => panic!("bad state: {:?}", s),
     }
     match foo.resume() {
-        State::Complete(()) => {}
+        GeneratorState::Complete(()) => {}
         s => panic!("bad state: {:?}", s),
     }
 }
@@ -69,11 +69,11 @@ fn yield_capture() {
     };
 
     match foo.resume() {
-        State::Yielded(ref s) if *s == "foo" => {}
+        GeneratorState::Yielded(ref s) if *s == "foo" => {}
         s => panic!("bad state: {:?}", s),
     }
     match foo.resume() {
-        State::Complete(()) => {}
+        GeneratorState::Complete(()) => {}
         s => panic!("bad state: {:?}", s),
     }
 }
@@ -86,11 +86,11 @@ fn simple_yield_value() {
     };
 
     match foo.resume() {
-        State::Yielded(ref s) if *s == "bar" => {}
+        GeneratorState::Yielded(ref s) if *s == "bar" => {}
         s => panic!("bad state: {:?}", s),
     }
     match foo.resume() {
-        State::Complete(ref s) if *s == "foo" => {}
+        GeneratorState::Complete(ref s) if *s == "foo" => {}
         s => panic!("bad state: {:?}", s),
     }
 }
@@ -104,11 +104,11 @@ fn return_after_yield() {
     };
 
     match foo.resume() {
-        State::Yielded(()) => {}
+        GeneratorState::Yielded(()) => {}
         s => panic!("bad state: {:?}", s),
     }
     match foo.resume() {
-        State::Complete(ref s) if *s == "foo" => {}
+        GeneratorState::Complete(ref s) if *s == "foo" => {}
         s => panic!("bad state: {:?}", s),
     }
 }
@@ -156,11 +156,11 @@ fn send_over_threads() {
     let mut foo = || { yield };
     thread::spawn(move || {
         match foo.resume() {
-            State::Yielded(()) => {}
+            GeneratorState::Yielded(()) => {}
             s => panic!("bad state: {:?}", s),
         }
         match foo.resume() {
-            State::Complete(()) => {}
+            GeneratorState::Complete(()) => {}
             s => panic!("bad state: {:?}", s),
         }
     }).join().unwrap();
@@ -169,11 +169,11 @@ fn send_over_threads() {
     let mut foo = || { yield a };
     thread::spawn(move || {
         match foo.resume() {
-            State::Yielded(ref s) if *s == "a" => {}
+            GeneratorState::Yielded(ref s) if *s == "a" => {}
             s => panic!("bad state: {:?}", s),
         }
         match foo.resume() {
-            State::Complete(()) => {}
+            GeneratorState::Complete(()) => {}
             s => panic!("bad state: {:?}", s),
         }
     }).join().unwrap();