summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsharkdp <davidpeter@web.de>2019-09-21 14:00:59 +0200
committersharkdp <davidpeter@web.de>2019-09-21 14:00:59 +0200
commit6e27b5dc17876f11c0e4f602b912e99c078da2dd (patch)
treeff596529f8ba62b8e56b7b52f19c4399a6f49a0a
parent601f748aeeb8e80c50ad945073b4d2c2ce2b45b2 (diff)
Simplify structure
-rw-r--r--Cargo.toml4
-rw-r--r--src/lib.rs1
-rw-r--r--src/main.rs4
-rw-r--r--src/unique_id.rs (renamed from src/walk/unique_id.rs)0
-rw-r--r--src/walk.rs (renamed from src/walk/mod.rs)4
5 files changed, 7 insertions, 6 deletions
diff --git a/Cargo.toml b/Cargo.toml
index bf20b92..b45b1c4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,6 +25,10 @@ features = ["suggestions", "color", "wrap_help"]
[dev-dependencies]
tempdir = "0.3"
+[[bin]]
+name = "diskus"
+path = "src/main.rs"
+
[profile.release]
lto = true
codegen-units = 1
diff --git a/src/lib.rs b/src/lib.rs
index c57b22f..0867b2b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -10,6 +10,7 @@
//! let (size_in_bytes, errors) = walk.run();
//! ```
+mod unique_id;
pub mod walk;
pub use crate::walk::Walk;
diff --git a/src/main.rs b/src/main.rs
index c2d2163..7921df0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,3 @@
-mod walk;
-
use std::path::PathBuf;
use clap::{crate_name, crate_version, App, AppSettings, Arg};
@@ -7,7 +5,7 @@ use humansize::file_size_opts::{self, FileSizeOpts};
use humansize::FileSize;
use num_format::{Locale, ToFormattedString};
-use crate::walk::Walk;
+use diskus::walk::{self, Walk};
fn print_result(size: u64, errors: &[walk::Err], size_format: &FileSizeOpts, verbose: bool) {
if verbose {
diff --git a/src/walk/unique_id.rs b/src/unique_id.rs
index eb44e72..eb44e72 100644
--- a/src/walk/unique_id.rs
+++ b/src/unique_id.rs
diff --git a/src/walk/mod.rs b/src/walk.rs
index d826096..25a2f73 100644
--- a/src/walk/mod.rs
+++ b/src/walk.rs
@@ -7,9 +7,7 @@ use crossbeam_channel as channel;
use rayon::{self, prelude::*};
-mod unique_id;
-
-use unique_id::{generate_unique_id, UniqueID};
+use crate::unique_id::{generate_unique_id, UniqueID};
pub enum Err {
NoMetadataForPath(PathBuf),