Merge pull request #3 from CertainLach/master

Update to latest nightly rust

Author: tinaun

src/lib.rs

@@ -7,11 +7,10 @@
 //! #![feature(generators)]
 //! #![feature(conservative_impl_trait)]
 //!
-//! extern crate gen_iter;
-//! use gen_iter::GenIter;
+//! use gen_iter::gen_iter;
 //!
 //! fn fibonacci() -> impl Iterator<Item = u64> {
-//!     GenIter(|| {
+//!     gen_iter!({
 //!         let mut a = 0;
 //!         let mut b = 1;
 //!
@@ -25,10 +24,8 @@
 //!     })
 //! }
 //!
-//! fn main() {
-//!     for elem in fibonacci().map(|x| 2 * x).take(10) {
-//!         println!("{}", elem);
-//!     }
+//! for elem in fibonacci().map(|x| 2 * x).take(10) {
+//!     println!("{}", elem);
 //! }
 //! ```
 //!
@@ -38,23 +35,25 @@
 
 use std::ops::{Generator, GeneratorState};
 use std::iter::Iterator;
+use std::marker::Unpin;
+use std::pin::Pin;
 
 /// a iterator that holds an internal generator representing
 /// the iteration state
 #[derive(Copy, Clone, Debug)]
 pub struct GenIter<T>(pub T)
 where
-    T: Generator<Return = ()>;
+    T: Generator<Return = ()> + Unpin;
 
 impl<T> Iterator for GenIter<T>
 where
-    T: Generator<Return = ()>,
+    T: Generator<Return = ()> + Unpin,
 {
     type Item = T::Yield;
 
     #[inline]
     fn next(&mut self) -> Option<Self::Item> {
-        match self.0.resume() {
+        match Pin::new(&mut self.0).resume(()) {
             GeneratorState::Yielded(n) => Some(n),
             GeneratorState::Complete(()) => None,
         }
@@ -63,7 +62,7 @@ where
 
 impl<G> From<G> for GenIter<G>
 where
-    G: Generator<Return = ()>,
+    G: Generator<Return = ()> + Unpin,
 {
     #[inline]
     fn from(gen: G) -> Self {
@@ -75,29 +74,24 @@ where
 /// macro to simplify iterator - via - generator construction
 ///
 /// ```
-/// # #![feature(generators)];
-/// # #[macro_use]
-/// # extern crate gen_iter;
-/// # fn main() {
-/// let mut g = gen_iter! {
+/// #![feature(generators)]
+///
+/// use gen_iter::gen_iter;
+///
+/// let mut g = gen_iter!({
 ///     yield 1;
 ///     yield 2;
-/// };
-///
+/// });
 ///
 /// assert_eq!(g.next(), Some(1));
 /// assert_eq!(g.next(), Some(2));
 /// assert_eq!(g.next(), None);
 ///
-///
-/// # }
 /// ```
 #[macro_export]
 macro_rules! gen_iter {
-    ($($exp:tt)*) => {
-        $crate::GenIter(|| {
-            $($exp)*
-        })
+    ($block: block) => {
+        $crate::GenIter(|| $block)
     }
 }
 
@@ -108,7 +102,7 @@ mod tests {
 
     #[test]
     fn it_works() {
-        let mut g = GenIter(|| {
+        let mut g = gen_iter!({
             yield 1;
             yield 2;
         });
@@ -120,10 +114,10 @@ mod tests {
 
     #[test]
     fn into_gen_iter() {
-        let mut g: GenIter<_> = (|| {
+        let mut g: GenIter<_> = gen_iter!({
             yield 1;
             yield 2;
-        }).into();
+        });
 
         assert_eq!(g.next(), Some(1));
         assert_eq!(g.next(), Some(2));
@@ -132,10 +126,10 @@ mod tests {
 
     #[test]
     fn gen_iter_macro() {
-        let mut g = gen_iter!{
+        let mut g = gen_iter!({
             yield 1;
             yield 2;
-        };
+        });
 
         assert_eq!(g.next(), Some(1));
         assert_eq!(g.next(), Some(2));