Merge pull request 293 from aatifsyed/master

Author: dtolnay

src/runtime.rs

@@ -305,68 +305,22 @@ pub fn push_ident_spanned(tokens: &mut TokenStream, span: Span, s: &str) {
 
 #[doc(hidden)]
 pub fn push_lifetime(tokens: &mut TokenStream, lifetime: &str) {
-    struct Lifetime<'a> {
-        name: &'a str,
-        state: u8,
-    }
-
-    impl<'a> Iterator for Lifetime<'a> {
-        type Item = TokenTree;
-
-        fn next(&mut self) -> Option<Self::Item> {
-            match self.state {
-                0 => {
-                    self.state = 1;
-                    Some(TokenTree::Punct(Punct::new('\'', Spacing::Joint)))
-                }
-                1 => {
-                    self.state = 2;
-                    Some(TokenTree::Ident(Ident::new(self.name, Span::call_site())))
-                }
-                _ => None,
-            }
-        }
-    }
-
-    tokens.extend(Lifetime {
-        name: &lifetime[1..],
-        state: 0,
-    });
+    tokens.extend([
+        TokenTree::Punct(Punct::new('\'', Spacing::Joint)),
+        TokenTree::Ident(Ident::new(&lifetime[1..], Span::call_site())),
+    ]);
 }
 
 #[doc(hidden)]
 pub fn push_lifetime_spanned(tokens: &mut TokenStream, span: Span, lifetime: &str) {
-    struct Lifetime<'a> {
-        name: &'a str,
-        span: Span,
-        state: u8,
-    }
-
-    impl<'a> Iterator for Lifetime<'a> {
-        type Item = TokenTree;
-
-        fn next(&mut self) -> Option<Self::Item> {
-            match self.state {
-                0 => {
-                    self.state = 1;
-                    let mut apostrophe = Punct::new('\'', Spacing::Joint);
-                    apostrophe.set_span(self.span);
-                    Some(TokenTree::Punct(apostrophe))
-                }
-                1 => {
-                    self.state = 2;
-                    Some(TokenTree::Ident(Ident::new(self.name, self.span)))
-                }
-                _ => None,
-            }
-        }
-    }
-
-    tokens.extend(Lifetime {
-        name: &lifetime[1..],
-        span,
-        state: 0,
-    });
+    tokens.extend([
+        TokenTree::Punct({
+            let mut apostrophe = Punct::new('\'', Spacing::Joint);
+            apostrophe.set_span(span);
+            apostrophe
+        }),
+        TokenTree::Ident(Ident::new(&lifetime[1..], span)),
+    ]);
 }
 
 macro_rules! push_punct {