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/model | |
| parent | f310fce34b0273f9f75e7a6ea665f51003a1f795 (diff) | |
| download | garage-ceb1f0229a9c8b9f8255b4a4c70272627f0c34d7.tar.gz garage-ceb1f0229a9c8b9f8255b4a4c70272627f0c34d7.zip | |
Move version back into utilimprove-deps
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/model/lib.rs | 1 | ||||
| -rw-r--r-- | src/model/version.rs | 28 |
3 files changed, 0 insertions, 31 deletions
diff --git a/src/model/Cargo.toml b/src/model/Cargo.toml index 101c97d3..bbcfe89c 100644 --- a/src/model/Cargo.toml +++ b/src/model/Cargo.toml @@ -24,9 +24,7 @@ async-trait = "0.1.7" arc-swap = "1.0" blake2 = "0.9" err-derive = "0.3" -git-version = "0.3.4" hex = "0.4" -lazy_static = "1.4" base64 = "0.13" tracing = "0.1.30" rand = "0.8" diff --git a/src/model/lib.rs b/src/model/lib.rs index 43db01c5..4f20ea46 100644 --- a/src/model/lib.rs +++ b/src/model/lib.rs @@ -19,4 +19,3 @@ pub mod s3; pub mod garage; pub mod helper; pub mod migrate; -pub mod version; diff --git a/src/model/version.rs b/src/model/version.rs deleted file mode 100644 index b515dccc..00000000 --- a/src/model/version.rs +++ /dev/null @@ -1,28 +0,0 @@ -use std::sync::Arc; - -use arc_swap::{ArcSwap, ArcSwapOption}; - -lazy_static::lazy_static! { - static ref VERSION: ArcSwap<&'static str> = ArcSwap::new(Arc::new(git_version::git_version!( - prefix = "git:", - cargo_prefix = "cargo:", - fallback = "unknown" - ))); - static ref FEATURES: ArcSwapOption<&'static [&'static str]> = ArcSwapOption::new(None); -} - -pub fn garage_version() -> &'static str { - &VERSION.load() -} - -pub fn garage_features() -> Option<&'static [&'static str]> { - FEATURES.load().as_ref().map(|f| &f[..]) -} - -pub fn init_version(version: &'static str) { - VERSION.store(Arc::new(version)); -} - -pub fn init_features(features: &'static [&'static str]) { - FEATURES.store(Some(Arc::new(features))); -} |