From d8fb70c454ff6ca572c44e51d0e7dc5c017600f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Saparelli?= Date: Thu, 22 Jul 2021 01:01:11 +1200 Subject: [PATCH] Cease with the 2015-style #[macro_use]s --- lib/src/config.rs | 1 + lib/src/gitignore.rs | 1 + lib/src/ignore.rs | 1 + lib/src/lib.rs | 7 ------- lib/src/notification_filter.rs | 1 + lib/src/run.rs | 1 + lib/src/signal.rs | 3 ++- lib/src/watcher.rs | 1 + 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/src/config.rs b/lib/src/config.rs index df29f36..a06b8a6 100644 --- a/lib/src/config.rs +++ b/lib/src/config.rs @@ -13,6 +13,7 @@ //! .expect("mission failed"); //! ``` +use derive_builder::Builder; use std::{path::PathBuf, time::Duration}; use crate::run::OnBusyUpdate; diff --git a/lib/src/gitignore.rs b/lib/src/gitignore.rs index a8bd372..9b3caba 100644 --- a/lib/src/gitignore.rs +++ b/lib/src/gitignore.rs @@ -1,4 +1,5 @@ use globset::{GlobBuilder, GlobSet, GlobSetBuilder}; +use log::debug; use std::borrow::ToOwned; use std::fs; diff --git a/lib/src/ignore.rs b/lib/src/ignore.rs index e9d5e2d..794a113 100644 --- a/lib/src/ignore.rs +++ b/lib/src/ignore.rs @@ -1,4 +1,5 @@ use globset::{GlobBuilder, GlobSet, GlobSetBuilder}; +use log::debug; use std::collections::HashSet; use std::fs; use std::io; diff --git a/lib/src/lib.rs b/lib/src/lib.rs index 3f153be..aab4cf1 100644 --- a/lib/src/lib.rs +++ b/lib/src/lib.rs @@ -8,13 +8,6 @@ #![doc(html_logo_url = "https://watchexec.github.io/logo:watchexec.svg")] #![warn(clippy::unwrap_used)] -#[macro_use] -extern crate derive_builder; -#[macro_use] -extern crate log; -#[macro_use] -extern crate lazy_static; - pub mod config; pub mod error; mod gitignore; diff --git a/lib/src/notification_filter.rs b/lib/src/notification_filter.rs index 6e80852..fc5df66 100644 --- a/lib/src/notification_filter.rs +++ b/lib/src/notification_filter.rs @@ -2,6 +2,7 @@ use crate::error; use crate::gitignore::Gitignore; use crate::ignore::Ignore; use globset::{Glob, GlobSet, GlobSetBuilder}; +use log::debug; use std::path::Path; pub struct NotificationFilter { diff --git a/lib/src/run.rs b/lib/src/run.rs index 90aa6e4..32b2c3f 100644 --- a/lib/src/run.rs +++ b/lib/src/run.rs @@ -1,6 +1,7 @@ #[cfg(unix)] use command_group::UnixChildExt; use command_group::{CommandGroup, GroupChild}; +use log::{debug, info, warn}; use std::{ collections::HashMap, diff --git a/lib/src/signal.rs b/lib/src/signal.rs index eccdae2..6b9bae9 100644 --- a/lib/src/signal.rs +++ b/lib/src/signal.rs @@ -1,7 +1,7 @@ use std::sync::Mutex; type CleanupFn = Box; -lazy_static! { +lazy_static::lazy_static! { static ref CLEANUP: Mutex> = Mutex::new(None); } @@ -106,6 +106,7 @@ pub fn install_handler(handler: F) where F: Fn(self::Signal) + 'static + Send + Sync, { + use log::debug; use nix::sys::signal::*; use std::thread; diff --git a/lib/src/watcher.rs b/lib/src/watcher.rs index 82dc45d..350dd71 100644 --- a/lib/src/watcher.rs +++ b/lib/src/watcher.rs @@ -1,3 +1,4 @@ +use log::debug; use notify::{raw_watcher, PollWatcher, RecommendedWatcher, RecursiveMode}; use std::convert::TryFrom; use std::path::PathBuf;