commit 4d918827147023aa604b839efe97d315228fa205
author David Tolnay <dtolnay@gmail.com> Wed May 08 17:05:52 2019 -0700
committer David Tolnay <dtolnay@gmail.com> Wed May 08 18:47:14 2019 -0700
tree 23c49a7e1eac50f1dceb286f806392b8dac77987
parent 1259791117328ce9ae171d71f8abfa7a65555a6a

Switch to TokenStream::extend

codegen/src/fold.rs

diff --git a/codegen/src/fold.rs b/codegen/src/fold.rs
index d1e1e54..f5b7753 100644
--- a/codegen/src/fold.rs
+++ b/codegen/src/fold.rs
@@ -1,6 +1,6 @@
 use crate::{file, full, gen};
 use proc_macro2::{Ident, Span, TokenStream};
-use quote::{quote, TokenStreamExt};
+use quote::quote;
 use syn::Index;
 use syn_codegen::{Data, Definitions, Features, Node, Type};
 
@@ -60,8 +60,8 @@
                 let i = Index::from(i);
                 let it = quote!((#name).#i);
                 let val = visit(elem, features, defs, &it).unwrap_or(it);
-                code.append_all(val);
-                code.append_all(quote!(,));
+                code.extend(val);
+                code.extend(quote!(,));
             }
             Some(quote! {
                 (#code)
@@ -127,7 +127,7 @@
                 let variant_ident = Ident::new(variant, Span::call_site());
 
                 if fields.is_empty() {
-                    fold_variants.append_all(quote! {
+                    fold_variants.extend(quote! {
                         #ty::#variant_ident => {
                             #ty::#variant_ident
                         }
@@ -140,20 +140,20 @@
                         let name = format!("_binding_{}", idx);
                         let binding = Ident::new(&name, Span::call_site());
 
-                        bind_fold_fields.append_all(quote! {
+                        bind_fold_fields.extend(quote! {
                             #binding,
                         });
 
                         let owned_binding = quote!(#binding);
 
-                        fold_fields.append_all(
+                        fold_fields.extend(
                             visit(ty, &s.features, defs, &owned_binding).unwrap_or(owned_binding),
                         );
 
-                        fold_fields.append_all(quote!(,));
+                        fold_fields.extend(quote!(,));
                     }
 
-                    fold_variants.append_all(quote! {
+                    fold_variants.extend(quote! {
                         #ty::#variant_ident(#bind_fold_fields) => {
                             #ty::#variant_ident(
                                 #fold_fields
@@ -163,7 +163,7 @@
                 }
             }
 
-            fold_impl.append_all(quote! {
+            fold_impl.extend(quote! {
                 match _i {
                     #fold_variants
                 }
@@ -177,39 +177,39 @@
                 let ref_toks = quote!(_i.#id);
                 let fold = visit(&ty, &s.features, defs, &ref_toks).unwrap_or(ref_toks);
 
-                fold_fields.append_all(quote! {
+                fold_fields.extend(quote! {
                     #id: #fold,
                 });
             }
 
             if !fields.is_empty() {
-                fold_impl.append_all(quote! {
+                fold_impl.extend(quote! {
                     #ty {
                         #fold_fields
                     }
                 })
             } else {
                 if ty == "Ident" {
-                    fold_impl.append_all(quote! {
+                    fold_impl.extend(quote! {
                         let mut _i = _i;
                         let span = _visitor.fold_span(_i.span());
                         _i.set_span(span);
                     });
                 }
-                fold_impl.append_all(quote! {
+                fold_impl.extend(quote! {
                     _i
                 });
             }
         }
         Data::Private => {
             if ty == "Ident" {
-                fold_impl.append_all(quote! {
+                fold_impl.extend(quote! {
                     let mut _i = _i;
                     let span = _visitor.fold_span(_i.span());
                     _i.set_span(span);
                 });
             }
-            fold_impl.append_all(quote! {
+            fold_impl.extend(quote! {
                 _i
             });
         }
@@ -220,7 +220,7 @@
         Data::Struct(_) | Data::Enum(_) => true,
     };
 
-    state.fold_trait.append_all(quote! {
+    state.fold_trait.extend(quote! {
         #features
         fn #fold_fn(&mut self, i: #ty) -> #ty {
             #fold_fn(self, i)
@@ -228,7 +228,7 @@
     });
 
     if include_fold_impl {
-        state.fold_impl.append_all(quote! {
+        state.fold_impl.extend(quote! {
             #features
             pub fn #fold_fn<V: Fold + ?Sized>(
                 _visitor: &mut V, _i: #ty