mirror of
https://github.com/watchexec/watchexec.git
synced 2024-09-29 22:51:33 +02:00
Clean up due to removing pubs
This commit is contained in:
parent
324fbe9055
commit
eafbc9a77b
@ -1,33 +1,18 @@
|
|||||||
use clap::{crate_version, value_t, values_t, App, Arg};
|
use clap::{crate_version, value_t, values_t, App, Arg};
|
||||||
use log::LevelFilter;
|
use log::LevelFilter;
|
||||||
use std::{
|
use std::{
|
||||||
ffi::OsString,
|
|
||||||
path::{PathBuf, MAIN_SEPARATOR},
|
path::{PathBuf, MAIN_SEPARATOR},
|
||||||
time::Duration,
|
time::Duration,
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::config::{Config, ConfigBuilder};
|
use watchexec::{
|
||||||
use crate::run::OnBusyUpdate;
|
config::{Config, ConfigBuilder},
|
||||||
use crate::{error, Shell};
|
error,
|
||||||
|
run::OnBusyUpdate,
|
||||||
|
Shell,
|
||||||
|
};
|
||||||
|
|
||||||
pub fn get_args() -> error::Result<(Config, LevelFilter)> {
|
pub fn get_args() -> error::Result<(Config, LevelFilter)> {
|
||||||
get_args_impl(None::<&[&str]>)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[allow(dead_code)]
|
|
||||||
pub fn get_args_from<I, T>(from: I) -> error::Result<(Config, LevelFilter)>
|
|
||||||
where
|
|
||||||
I: IntoIterator<Item = T>,
|
|
||||||
T: Into<OsString> + Clone,
|
|
||||||
{
|
|
||||||
get_args_impl(Some(from))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_args_impl<I, T>(from: Option<I>) -> error::Result<(Config, LevelFilter)>
|
|
||||||
where
|
|
||||||
I: IntoIterator<Item = T>,
|
|
||||||
T: Into<OsString> + Clone,
|
|
||||||
{
|
|
||||||
let app = App::new("watchexec")
|
let app = App::new("watchexec")
|
||||||
.version(crate_version!())
|
.version(crate_version!())
|
||||||
.about("Execute commands when watched files change")
|
.about("Execute commands when watched files change")
|
||||||
@ -142,11 +127,7 @@ where
|
|||||||
.short("W")
|
.short("W")
|
||||||
.long("watch-when-idle"));
|
.long("watch-when-idle"));
|
||||||
|
|
||||||
let args = match from {
|
let args = app.get_matches();
|
||||||
None => app.get_matches(),
|
|
||||||
Some(i) => app.get_matches_from(i),
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut builder = ConfigBuilder::default();
|
let mut builder = ConfigBuilder::default();
|
||||||
|
|
||||||
let cmd: Vec<String> =
|
let cmd: Vec<String> =
|
||||||
|
@ -1,19 +1,16 @@
|
|||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
|
|
||||||
|
use watchexec::{error::Result, run};
|
||||||
|
|
||||||
mod args;
|
mod args;
|
||||||
|
|
||||||
fn main() -> error::Result<()> {
|
fn main() -> Result<()> {
|
||||||
#[allow(deprecated)]
|
|
||||||
let (args, loglevel) = args::get_args()?;
|
let (args, loglevel) = args::get_args()?;
|
||||||
init_logger(loglevel);
|
|
||||||
watchexec::run(args)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn init_logger(level: log::LevelFilter) {
|
env_logger::Builder::new()
|
||||||
let mut log_builder = env_logger::Builder::new();
|
|
||||||
|
|
||||||
log_builder
|
|
||||||
.format(|buf, r| writeln!(buf, "*** {}", r.args()))
|
.format(|buf, r| writeln!(buf, "*** {}", r.args()))
|
||||||
.filter(None, level)
|
.filter(None, loglevel)
|
||||||
.init();
|
.init();
|
||||||
|
|
||||||
|
run(args)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user