rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename State to GeneratorState

Browse Source
This commit is contained in:
John Kåre Alsaker
2017-07-20 01:16:12 +02:00
parent 62e210fb3c
commit df0496a620
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/liballoc/boxed.rs
View File

@@ -66,7 +66,7 @@ use core::hash::{self, Hash};
use core::iter::FusedIterator; use core::iter::FusedIterator;
use core::marker::{self, Unsize}; use core::marker::{self, Unsize};
use core::mem; 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::ops::{BoxPlace, Boxed, InPlace, Place, Placer};
use core::ptr::{self, Unique}; use core::ptr::{self, Unique};
use core::convert::From; use core::convert::From;
@@ -791,7 +791,7 @@ impl<T> Generator for Box<T>
{ {
type Yield = T::Yield; type Yield = T::Yield;
type Return = T::Return; type Return = T::Return;
fn resume(&mut self) -> State<Self::Yield, Self::Return> { fn resume(&mut self) -> GeneratorState<Self::Yield, Self::Return> {
(**self).resume() (**self).resume()
} }
} }

6
src/libcore/ops/generator.rs
View File

@@ -16,7 +16,7 @@
#[derive(Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Debug, Hash)] #[derive(Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Debug, Hash)]
#[cfg_attr(not(stage0), lang = "generator_state")] #[cfg_attr(not(stage0), lang = "generator_state")]
#[unstable(feature = "generator_trait", issue = "43122")] #[unstable(feature = "generator_trait", issue = "43122")]
pub enum State<Y, R> { pub enum GeneratorState<Y, R> {
/// The generator suspended with a value. /// The generator suspended with a value.
/// ///
/// This state indicates that a generator has been suspended, and typically /// 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 /// been returned previously. While generator literals in the language are
/// guaranteed to panic on resuming after `Complete`, this is not guaranteed /// guaranteed to panic on resuming after `Complete`, this is not guaranteed
/// for all implementations of the `Generator` trait. /// 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")] #[unstable(feature = "generator_trait", issue = "43122")]
@@ -125,7 +125,7 @@ impl<'a, T> Generator for &'a mut T
{ {
type Yield = T::Yield; type Yield = T::Yield;
type Return = T::Return; type Return = T::Return;
fn resume(&mut self) -> State<Self::Yield, Self::Return> { fn resume(&mut self) -> GeneratorState<Self::Yield, Self::Return> {
(**self).resume() (**self).resume()
} }
} }

2
src/libcore/ops/mod.rs
View File

@@ -191,7 +191,7 @@ pub use self::range::{RangeInclusive, RangeToInclusive};
pub use self::try::Try; pub use self::try::Try;
#[unstable(feature = "generator_trait", issue = "43122")] #[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")] #[unstable(feature = "placement_new_protocol", issue = "27779")]
pub use self::place::{Place, Placer, InPlace, Boxed, BoxPlace}; pub use self::place::{Place, Placer, InPlace, Boxed, BoxPlace};