diff options
| -rw-r--r-- | src/liballoc/boxed.rs | 4 | ||||
| -rw-r--r-- | src/libcore/ops/generator.rs | 6 | ||||
| -rw-r--r-- | src/libcore/ops/mod.rs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index f9eeb74ea00..17dc3d03aae 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -66,7 +66,7 @@ use core::hash::{self, Hash}; use core::iter::FusedIterator; use core::marker::{self, Unsize}; use core::mem; -use core::ops::{CoerceUnsized, Deref, DerefMut, Generator, State}; +use core::ops::{CoerceUnsized, Deref, DerefMut, Generator, GeneratorState}; use core::ops::{BoxPlace, Boxed, InPlace, Place, Placer}; use core::ptr::{self, Unique}; use core::convert::From; @@ -791,7 +791,7 @@ impl<T> Generator for Box<T> { type Yield = T::Yield; type Return = T::Return; - fn resume(&mut self) -> State<Self::Yield, Self::Return> { + fn resume(&mut self) -> GeneratorState<Self::Yield, Self::Return> { (**self).resume() } } diff --git a/src/libcore/ops/generator.rs b/src/libcore/ops/generator.rs index 5734e8008b7..a8217676653 100644 --- a/src/libcore/ops/generator.rs +++ b/src/libcore/ops/generator.rs @@ -16,7 +16,7 @@ #[derive(Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Debug, Hash)] #[cfg_attr(not(stage0), lang = "generator_state")] #[unstable(feature = "generator_trait", issue = "43122")] -pub enum State<Y, R> { +pub enum GeneratorState<Y, R> { /// The generator suspended with a value. /// /// This state indicates that a generator has been suspended, and typically @@ -116,7 +116,7 @@ pub trait Generator { /// been returned previously. While generator literals in the language are /// guaranteed to panic on resuming after `Complete`, this is not guaranteed /// for all implementations of the `Generator` trait. - fn resume(&mut self) -> State<Self::Yield, Self::Return>; + fn resume(&mut self) -> GeneratorState<Self::Yield, Self::Return>; } #[unstable(feature = "generator_trait", issue = "43122")] @@ -125,7 +125,7 @@ impl<'a, T> Generator for &'a mut T { type Yield = T::Yield; type Return = T::Return; - fn resume(&mut self) -> State<Self::Yield, Self::Return> { + fn resume(&mut self) -> GeneratorState<Self::Yield, Self::Return> { (**self).resume() } } diff --git a/src/libcore/ops/mod.rs b/src/libcore/ops/mod.rs index 0f415a60c80..767b22e851e 100644 --- a/src/libcore/ops/mod.rs +++ b/src/libcore/ops/mod.rs @@ -191,7 +191,7 @@ pub use self::range::{RangeInclusive, RangeToInclusive}; pub use self::try::Try; #[unstable(feature = "generator_trait", issue = "43122")] -pub use self::generator::{Generator, State}; +pub use self::generator::{Generator, GeneratorState}; #[unstable(feature = "placement_new_protocol", issue = "27779")] pub use self::place::{Place, Placer, InPlace, Boxed, BoxPlace}; |