diff options
| author | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2017-07-20 01:16:12 +0200 |
|---|---|---|
| committer | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2017-07-28 15:46:27 +0200 |
| commit | df0496a620f1a6e322df9748c9843ee8d87a8bd6 (patch) | |
| tree | 79c573e8a2eed1f9e9e0e54c815c91c1f1371d33 /src/liballoc | |
| parent | 62e210fb3c26ffcfd767e17698e0ba9ce76d3e4d (diff) | |
| download | rust-df0496a620f1a6e322df9748c9843ee8d87a8bd6.tar.gz rust-df0496a620f1a6e322df9748c9843ee8d87a8bd6.zip | |
Rename State to GeneratorState
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 4 |
1 files changed, 2 insertions, 2 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() } } |