Ditch id generator

structopt-derive/src/attrs.rs

@@ -312,17 +312,15 @@ impl Attrs {
                                     https://docs.rs/structopt/0.3.5/structopt/#magical-methods")
                         };
 
-                        let static_name = format_ident!("__STRUCTOPT_DEFAULT_VALUE_{}", fresh_id());
-
                         quote_spanned!(ident.span()=> {
                             ::structopt::lazy_static::lazy_static! {
-                                static ref #static_name: &'static str = {
+                                static ref DEFAULT_VALUE: &'static str = {
                                     let val = <#ty as ::std::default::Default>::default();
                                     let s = ::std::string::ToString::to_string(&val);
                                     ::std::boxed::Box::leak(s.into_boxed_str())
                                 };
                             }
-                            *#static_name
+                            *DEFAULT_VALUE
                         })
                     };
 
@@ -642,20 +640,6 @@ impl Attrs {
     }
 }
 
-fn fresh_id() -> usize {
-    use std::cell::Cell;
-
-    thread_local! {
-        static NEXT_ID: Cell<usize> = Cell::new(0);
-    }
-
-    NEXT_ID.with(|next_id| {
-        let id = next_id.get();
-        next_id.set(id + 1);
-        id
-    })
-}
-
 /// replace all `:` with `, ` when not inside the `<>`
 ///
 /// `"author1:author2:author3" => "author1, author2, author3"`