fix logging tests

colin-kiegel · Jul 29, 2020 · e29f1cc · e29f1cc
1 parent 01abba2
commit e29f1cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/derive_builder/build/skeptic.rs b/derive_builder/build/skeptic.rs
@@ -14,7 +14,7 @@ mod log_disabled {
 fn main() {
     println!("INFO: Run with `RUST_LOG=build_script_build=trace` for debug information.");
     #[cfg(feature = "logging")]
-    env_logger::init().unwrap();
+    env_logger::init();
 
     let mut files = generate_doc_tpl_tests().unwrap();
     files.push("README.md".to_string());
@@ -62,7 +62,7 @@ use std::io::{Write, Read};
 const DOC_TPL_DIR: &'static str = "src/doc_tpl/";
 const DOC_TPL_OUT_DIR: &'static str = "doc_tpl/";
 
-fn generate_doc_tpl_tests() -> Result<Vec<String>, Box<Error>> {
+fn generate_doc_tpl_tests() -> Result<Vec<String>, Box<dyn Error>> {
     trace!("Generating doc template tests");
     let root_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR")?);
     let mut tpl_dir = root_dir;

diff --git a/derive_builder/src/lib.rs b/derive_builder/src/lib.rs
@@ -581,17 +581,17 @@ use darling::FromDeriveInput;
 use options::Options;
 use proc_macro::TokenStream;
 #[cfg(feature = "logging")]
-use std::sync::{Once, ONCE_INIT};
+use std::sync::Once;
 
 #[cfg(feature = "logging")]
-static INIT_LOGGER: Once = ONCE_INIT;
+static INIT_LOGGER: Once = Once::new();
 
 #[doc(hidden)]
 #[proc_macro_derive(Builder, attributes(builder))]
 pub fn derive(input: TokenStream) -> TokenStream {
     #[cfg(feature = "logging")]
     INIT_LOGGER.call_once(|| {
-        env_logger::init().unwrap();
+        env_logger::init();
     });
 
     let ast = parse_macro_input!(input as syn::DeriveInput);