diff options
| -rw-r--r-- | src/libcore/ops/generator.rs | 16 | ||||
| -rw-r--r-- | src/test/ui/generator/ref-escapes-but-not-over-yield.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/generator/yield-while-iterating.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/generator/yield-while-local-borrowed.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/generator/yield-while-ref-reborrowed.rs | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/libcore/ops/generator.rs b/src/libcore/ops/generator.rs index a8217676653..798c182bc6e 100644 --- a/src/libcore/ops/generator.rs +++ b/src/libcore/ops/generator.rs @@ -48,7 +48,7 @@ pub enum GeneratorState<Y, R> { /// ```rust /// #![feature(generators, generator_trait)] /// -/// use std::ops::{Generator, State}; +/// use std::ops::{Generator, GeneratorState}; /// /// fn main() { /// let mut generator = || { @@ -57,11 +57,11 @@ pub enum GeneratorState<Y, R> { /// }; /// /// match generator.resume() { -/// State::Yielded(1) => {} +/// GeneratorState::Yielded(1) => {} /// _ => panic!("unexpected return from resume"), /// } /// match generator.resume() { -/// State::Complete("foo") => {} +/// GeneratorState::Complete("foo") => {} /// _ => panic!("unexpected return from resume"), /// } /// } @@ -100,11 +100,11 @@ pub trait Generator { /// /// # Return value /// - /// The `State` enum returned from this function indicates what state the - /// generator is in upon returning. If the `Yielded` variant is returned - /// then the generator has reached a suspension point and a value has been - /// yielded out. Generators in this state are available for resumption at a - /// later point. + /// The `GeneratorState` enum returned from this function indicates what + /// state the generator is in upon returning. If the `Yielded` variant is + /// returned then the generator has reached a suspension point and a value + /// has been yielded out. Generators in this state are available for + /// resumption at a later point. /// /// If `Complete` is returned then the generator has completely finished /// with the value provided. It is invalid for the generator to be resumed diff --git a/src/test/ui/generator/ref-escapes-but-not-over-yield.rs b/src/test/ui/generator/ref-escapes-but-not-over-yield.rs index 8d77eb92a63..87edbb22baa 100644 --- a/src/test/ui/generator/ref-escapes-but-not-over-yield.rs +++ b/src/test/ui/generator/ref-escapes-but-not-over-yield.rs @@ -10,7 +10,7 @@ #![feature(generators, generator_trait)] -use std::ops::{State, Generator}; +use std::ops::{GeneratorState, Generator}; use std::cell::Cell; fn foo(x: &i32) { diff --git a/src/test/ui/generator/yield-while-iterating.rs b/src/test/ui/generator/yield-while-iterating.rs index fd260339efb..bc53448cb08 100644 --- a/src/test/ui/generator/yield-while-iterating.rs +++ b/src/test/ui/generator/yield-while-iterating.rs @@ -10,7 +10,7 @@ #![feature(generators, generator_trait)] -use std::ops::{State, Generator}; +use std::ops::{GeneratorState, Generator}; use std::cell::Cell; fn yield_during_iter_owned_data(x: Vec<i32>) { diff --git a/src/test/ui/generator/yield-while-local-borrowed.rs b/src/test/ui/generator/yield-while-local-borrowed.rs index b3e6dedf291..d21c86e8868 100644 --- a/src/test/ui/generator/yield-while-local-borrowed.rs +++ b/src/test/ui/generator/yield-while-local-borrowed.rs @@ -10,7 +10,7 @@ #![feature(generators, generator_trait)] -use std::ops::{State, Generator}; +use std::ops::{GeneratorState, Generator}; use std::cell::Cell; fn borrow_local_inline() { diff --git a/src/test/ui/generator/yield-while-ref-reborrowed.rs b/src/test/ui/generator/yield-while-ref-reborrowed.rs index 7b6246b1578..b9c963ae740 100644 --- a/src/test/ui/generator/yield-while-ref-reborrowed.rs +++ b/src/test/ui/generator/yield-while-ref-reborrowed.rs @@ -10,7 +10,7 @@ #![feature(generators, generator_trait)] -use std::ops::{State, Generator}; +use std::ops::{GeneratorState, Generator}; use std::cell::Cell; fn reborrow_shared_ref(x: &i32) { |