diff --git a/Cargo.lock b/Cargo.lock index 4db4681d0..15ecf0a9f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -912,7 +912,6 @@ dependencies = [ "predicates", "prettytable-rs", "taskchampion", - "uuid", ] [[package]] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index c5bf41c85..cf26fad96 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -6,7 +6,6 @@ edition = "2018" [dependencies] clap = "~2.33.0" -uuid = { version = "0.8.1", features = ["serde", "v4"] } taskchampion = { path = "../taskchampion" } failure = "0.1.8" prettytable-rs = "0.8.0" diff --git a/cli/src/cmd/add.rs b/cli/src/cmd/add.rs index c34e82453..a04ad8658 100644 --- a/cli/src/cmd/add.rs +++ b/cli/src/cmd/add.rs @@ -1,7 +1,6 @@ use clap::{App, Arg, ArgMatches, SubCommand as ClapSubCommand}; use failure::{format_err, Fallible}; -use taskchampion::Status; -use uuid::Uuid; +use taskchampion::{Status, Uuid}; use crate::cmd::{ArgMatchResult, CommandInvocation}; diff --git a/cli/src/cmd/shared.rs b/cli/src/cmd/shared.rs index eb472ab23..570095fb1 100644 --- a/cli/src/cmd/shared.rs +++ b/cli/src/cmd/shared.rs @@ -1,7 +1,6 @@ use clap::Arg; use failure::{format_err, Fallible}; -use taskchampion::{Replica, Task}; -use uuid::Uuid; +use taskchampion::{Replica, Task, Uuid}; pub(super) fn task_arg<'a>() -> Arg<'a, 'a> { Arg::with_name("task") diff --git a/taskchampion/src/lib.rs b/taskchampion/src/lib.rs index d5d1d13be..471437a4f 100644 --- a/taskchampion/src/lib.rs +++ b/taskchampion/src/lib.rs @@ -34,5 +34,8 @@ pub use task::Priority; pub use task::Status; pub use task::{Task, TaskMut}; +/// Re-exported type from the `uuid` crate, for ease of compatibility for consumers of this crate. +pub use uuid::Uuid; + #[cfg(test)] pub(crate) mod testing;