diff options
author | Alex Auvolat <alex@adnab.me> | 2022-09-07 18:36:46 +0200 |
---|---|---|
committer | Alex Auvolat <alex@adnab.me> | 2022-09-07 18:36:46 +0200 |
commit | ceb1f0229a9c8b9f8255b4a4c70272627f0c34d7 (patch) | |
tree | cf55d93dc4d95bc3eacb756f853ffe63e2dafc44 /src/garage | |
parent | f310fce34b0273f9f75e7a6ea665f51003a1f795 (diff) | |
download | garage-ceb1f0229a9c8b9f8255b4a4c70272627f0c34d7.tar.gz garage-ceb1f0229a9c8b9f8255b4a4c70272627f0c34d7.zip |
Move version back into utilimprove-deps
Diffstat (limited to 'src/garage')
-rw-r--r-- | src/garage/admin.rs | 4 | ||||
-rw-r--r-- | src/garage/cli/structs.rs | 2 | ||||
-rw-r--r-- | src/garage/main.rs | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/garage/admin.rs b/src/garage/admin.rs index 9c4ecd9d..b4d2d1a1 100644 --- a/src/garage/admin.rs +++ b/src/garage/admin.rs @@ -742,8 +742,8 @@ impl AdminRpcHandler { writeln!( &mut ret, "\nGarage version: {} [features: {}]", - garage_model::version::garage_version(), - garage_model::version::garage_features() + garage_util::version::garage_version(), + garage_util::version::garage_features() .map(|list| list.join(", ")) .unwrap_or_else(|| "(unknown)".into()), ) diff --git a/src/garage/cli/structs.rs b/src/garage/cli/structs.rs index 825fe859..06548e89 100644 --- a/src/garage/cli/structs.rs +++ b/src/garage/cli/structs.rs @@ -1,7 +1,7 @@ use serde::{Deserialize, Serialize}; use structopt::StructOpt; -use garage_model::version::garage_version; +use garage_util::version::garage_version; #[derive(StructOpt, Debug)] pub enum Command { diff --git a/src/garage/main.rs b/src/garage/main.rs index 1a4a939a..77d5db24 100644 --- a/src/garage/main.rs +++ b/src/garage/main.rs @@ -99,14 +99,14 @@ async fn main() { "system-libs", ][..]; if let Some(git_version) = option_env!("GIT_VERSION") { - garage_model::version::init_version(git_version); + garage_util::version::init_version(git_version); } - garage_model::version::init_features(features); + garage_util::version::init_features(features); // Parse arguments let version = format!( "{} [features: {}]", - garage_model::version::garage_version(), + garage_util::version::garage_version(), features.join(", ") ); let opt = Opt::from_clap(&Opt::clap().version(version.as_str()).get_matches()); |