Remove default()

taiki-e · May 29, 2019 · 906b11e · 906b11e
1 parent da7f1cf
commit 906b11e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/core/src/auto_enum/context.rs b/core/src/auto_enum/context.rs
@@ -3,9 +3,9 @@ use std::cell::RefCell;
 use proc_macro2::{Ident, TokenStream};
 use quote::ToTokens;
 use smallvec::{smallvec, SmallVec};
-use syn::{Attribute, Expr, ExprCall, ExprPath, ItemEnum, Macro, Result};
+use syn::{token, Attribute, Expr, ExprCall, ExprPath, ItemEnum, Macro, Result};
 
-use crate::utils::{default, ident, path, Stack};
+use crate::utils::{ident, path, Stack};
 
 use super::{
     visitor::{Dummy, FindTry, Visitor},
@@ -262,7 +262,7 @@ impl Builder {
                 qself: None,
                 path: path(segments),
             })),
-            paren_token: default(),
+            paren_token: token::Paren::default(),
             args: Some(expr).into_iter().collect(),
         })
     }

diff --git a/core/src/auto_enum/expr.rs b/core/src/auto_enum/expr.rs
@@ -5,7 +5,7 @@ use syn::{
     *,
 };
 
-use crate::utils::{default, expr_block, replace_block, replace_expr, OptionExt};
+use crate::utils::{expr_block, replace_block, replace_expr, OptionExt};
 
 use super::*;
 
@@ -209,7 +209,7 @@ impl VisitLast<()> for ExprMatch {
 
         self.arms.iter_mut().try_for_each(|arm| {
             if !skip(arm, cx)? {
-                arm.comma = Some(default());
+                arm.comma = Some(token::Comma::default());
                 replace_expr(&mut *arm.body, |x| cx.next_expr(x));
             }
 

diff --git a/core/src/utils.rs b/core/src/utils.rs
@@ -3,8 +3,8 @@ use std::mem;
 use proc_macro2::{Ident, Span, TokenStream};
 use smallvec::SmallVec;
 use syn::{
-    punctuated::Punctuated, Block, Expr, ExprBlock, ExprTuple, ExprVerbatim, Path, PathSegment,
-    Stmt,
+    punctuated::Punctuated, token, Block, Expr, ExprBlock, ExprTuple, ExprVerbatim, Path,
+    PathSegment, Stmt,
 };
 
 pub(crate) type Stack<T> = SmallVec<[T; 4]>;
@@ -41,10 +41,6 @@ impl<T> VecExt<T> for Vec<T> {
 // =============================================================================
 // Functions
 
-pub(crate) fn default<T: Default>() -> T {
-    T::default()
-}
-
 pub(crate) fn ident<S: AsRef<str>>(s: S) -> Ident {
     Ident::new(s.as_ref(), Span::call_site())
 }
@@ -54,15 +50,19 @@ pub(crate) fn path<I: IntoIterator<Item = PathSegment>>(segments: I) -> Path {
 }
 
 pub(crate) fn block(stmts: Vec<Stmt>) -> Block {
-    Block { brace_token: default(), stmts }
+    Block { brace_token: token::Brace::default(), stmts }
 }
 
 pub(crate) fn expr_block(block: Block) -> Expr {
     Expr::Block(ExprBlock { attrs: Vec::new(), label: None, block })
 }
 
 pub(crate) fn unit() -> Expr {
-    Expr::Tuple(ExprTuple { attrs: Vec::new(), paren_token: default(), elems: Punctuated::new() })
+    Expr::Tuple(ExprTuple {
+        attrs: Vec::new(),
+        paren_token: token::Paren::default(),
+        elems: Punctuated::new(),
+    })
 }
 
 pub(crate) fn replace_expr<F: FnOnce(Expr) -> Expr>(this: &mut Expr, op: F) {