diff --git a/Cargo.lock b/Cargo.lock index 42adbc5..6214e4e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -145,9 +145,6 @@ name = "cc" version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" -dependencies = [ - "jobserver", -] [[package]] name = "cfg-if" @@ -374,26 +371,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "enum-iterator" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "706d9e7cf1c7664859d79cd524e4e53ea2b67ea03c98cc2870c5e539695d597e" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355f93763ef7b0ae1c43c4d8eccc9d5848d84ad1a1d8ce61c421d1ac85a19d05" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "enum_dispatch" version = "0.3.11" @@ -589,37 +566,12 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] -[[package]] -name = "getset" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "gimli" version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" -[[package]] -name = "git2" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" -dependencies = [ - "bitflags 1.3.2", - "libc", - "libgit2-sys", - "log", - "url", -] - [[package]] name = "glob" version = "0.3.1" @@ -849,15 +801,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" -[[package]] -name = "jobserver" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] - [[package]] name = "js-sys" version = "0.3.61" @@ -879,30 +822,6 @@ version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" -[[package]] -name = "libgit2-sys" -version = "0.14.2+1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] - -[[package]] -name = "libz-sys" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "link-cplusplus" version = "1.0.8" @@ -1234,30 +1153,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" version = "1.0.53" @@ -1694,7 +1589,6 @@ dependencies = [ name = "solar-grabber" version = "0.2.2" dependencies = [ - "anyhow", "chrono", "color-eyre", "enum_dispatch", @@ -2099,17 +1993,12 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "7.5.1" +version = "8.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21b881cd6636ece9735721cf03c1fe1e774fe258683d084bb2812ab67435749" +checksum = "c1b86a8af1dedf089b1c78338678e4c7492b6045649042d94faf19690499d236" dependencies = [ "anyhow", - "cfg-if", - "enum-iterator", - "getset", - "git2", "rustversion", - "thiserror", "time 0.3.20", ] diff --git a/Cargo.toml b/Cargo.toml index bda23d4..8cf6b24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,8 +24,7 @@ thiserror = "1.0.38" url = "2.2.2" [build-dependencies] -anyhow = "1.0.68" -vergen = { version = "7.5.0", default_features = false, features = ["build", "git"] } +vergen = { version = "8.1.1", features = ["build", "git", "gitcl"] } [package.metadata.deb] maintainer = "Paul van Tilburg " diff --git a/build.rs b/build.rs index 7ce7a8a..a390899 100644 --- a/build.rs +++ b/build.rs @@ -1,7 +1,9 @@ -use anyhow::Result; -use vergen::{vergen, Config}; +use std::error::Error; +use vergen::EmitBuilder; -fn main() -> Result<()> { +fn main() -> Result<(), Box> { // Generate the `cargo:` instructions to fill the appropriate environment variables. - vergen(Config::default()) + EmitBuilder::builder().all_build().all_git().emit()?; + + Ok(()) } diff --git a/src/lib.rs b/src/lib.rs index 0a0e974..dd2aa6f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -97,7 +97,7 @@ impl VersionInfo { /// Retrieves the version information from the environment variables. fn new() -> Self { Self { - version: String::from(env!("VERGEN_BUILD_SEMVER")), + version: String::from(env!("CARGO_PKG_VERSION")), timestamp: String::from(env!("VERGEN_BUILD_TIMESTAMP")), git_sha: String::from(&env!("VERGEN_GIT_SHA")[0..7]), git_timestamp: String::from(env!("VERGEN_GIT_COMMIT_TIMESTAMP")), @@ -142,7 +142,7 @@ pub fn setup() -> Rocket { .attach(AdHoc::on_liftoff("Version", |_| { Box::pin(async move { let name = env!("CARGO_PKG_NAME"); - let version = env!("VERGEN_BUILD_SEMVER"); + let version = env!("CARGO_PKG_VERSION"); let git_sha = &env!("VERGEN_GIT_SHA")[0..7]; println!("☀️ Started {name} v{version} (git @{git_sha})");