---

bgamari · bgamari · commit 4a4ce49be9aa · 2014-07-16T22:24:42.000-04:00
yaml --- r: 153519 b: refs/heads/try2 c: 96072d6 h: refs/heads/master i: 153517: e953da6 153515: cc46281 153511: f8e32d6 153503: 174510d v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 8659889ed959d1a5921cb18e42d92e7a4cad5903
+refs/heads/try2: 96072d6efc110e81ab6e0a70e2bf9a96a53268b6
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/libsyntax/ext/quote.rs b/branches/try2/src/libsyntax/ext/quote.rs
@@ -54,9 +54,10 @@ pub mod rt {
         }
     }
 
-    impl ToTokens for Vec<TokenTree> {
-        fn to_tokens(&self, _cx: &ExtCtxt) -> Vec<TokenTree> {
-            (*self).clone()
+    impl<T: ToTokens> ToTokens for Vec<T> {
+        fn to_tokens(&self, cx: &ExtCtxt) -> Vec<TokenTree> {
+            let a = self.iter().flat_map(|t| t.to_tokens(cx).move_iter());
+            FromIterator::from_iter(a)
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,10 @@ pub mod rt {`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`- impl ToTokens for Vec<TokenTree> {`
`58`		`- fn to_tokens(&self, _cx: &ExtCtxt) -> Vec<TokenTree> {`
`59`		`- (*self).clone()`
	`57`	`+ impl<T: ToTokens> ToTokens for Vec<T> {`
	`58`	`+ fn to_tokens(&self, cx: &ExtCtxt) -> Vec<TokenTree> {`
	`59`	`+ let a = self.iter().flat_map(\|t\| t.to_tokens(cx).move_iter());`
	`60`	`+ FromIterator::from_iter(a)`
`60`	`61`	`}`
`61`	`62`	`}`
`62`	`63`