diff options
| author | boasting-squirrel <boasting.squirrel@gmail.com> | 2019-02-13 17:51:51 +0000 |
|---|---|---|
| committer | boasting-squirrel <boasting.squirrel@gmail.com> | 2019-02-13 17:51:51 +0000 |
| commit | d410b27e85ffa653a64d10bcd6b43cc5f64fe5d9 (patch) | |
| tree | 50bed1bf017347115b70db35c5034ae46695f182 /src/args.rs | |
| parent | Fixed Clippy warnings (diff) | |
| download | miniserve-d410b27e85ffa653a64d10bcd6b43cc5f64fe5d9.tar.gz miniserve-d410b27e85ffa653a64d10bcd6b43cc5f64fe5d9.zip | |
Removed config.rs and put back actix config in main.rs
Diffstat (limited to 'src/args.rs')
| -rw-r--r-- | src/args.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/args.rs b/src/args.rs index a3a440e..64ff3e6 100644 --- a/src/args.rs +++ b/src/args.rs @@ -1,5 +1,4 @@ use crate::auth; -use crate::config; use crate::listing; use clap::{crate_authors, crate_description, crate_name, crate_version}; use std::net::{IpAddr, Ipv4Addr, Ipv6Addr}; @@ -38,7 +37,7 @@ fn is_valid_auth(auth: String) -> Result<(), String> { .map(|_| ()) } -pub fn parse_args() -> config::MiniserveConfig { +pub fn parse_args() -> crate::MiniserveConfig { use clap::{App, AppSettings, Arg}; let matches = App::new(crate_name!()) @@ -152,7 +151,7 @@ pub fn parse_args() -> config::MiniserveConfig { let reverse_sort = matches.is_present("reverse"); - config::MiniserveConfig { + crate::MiniserveConfig { verbose, path: PathBuf::from(path.unwrap_or(".")), port, |