diff --git a/Cargo.lock b/Cargo.lock index 9d9972f..2188fd1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -686,6 +686,26 @@ dependencies = [ "syn", ] +[[package]] +name = "enum-iterator" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c79a6321a1197d7730510c7e3f6cb80432dfefecb32426de8cea0aa19b4bb8d7" +dependencies = [ + "enum-iterator-derive", +] + +[[package]] +name = "enum-iterator-derive" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e94aa31f7c0dc764f57896dc615ddd76fc13b0d5dca7eb6cc5e018a5a09ec06" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "flate2" version = "1.0.13" @@ -894,6 +914,18 @@ dependencies = [ "wasi 0.10.0+wasi-snapshot-preview1", ] +[[package]] +name = "getset" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24b328c01a4d71d2d8173daa93562a73ab0fe85616876f02500f53d82948c504" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "git2" version = "0.13.17" @@ -1609,6 +1641,30 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +[[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", + "version_check 0.9.1", +] + +[[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 0.9.1", +] + [[package]] name = "proc-macro-hack" version = "0.5.19" @@ -2552,13 +2608,17 @@ checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" [[package]] name = "vergen" -version = "3.2.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7141e445af09c8919f1d5f8a20dae0b20c3b57a45dee0d5823c6ed5d237f15a" +checksum = "7559dbf502657d16ddfdee53eea0827fc40ea7e3a53bc8b92d7317417cf9420e" dependencies = [ "bitflags", "chrono", - "rustc_version", + "enum-iterator", + "getset", + "git2", + "serde 1.0.123", + "serde_derive", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b6525b8..156b4aa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ tracing-subscriber = "0.2.16" [build-dependencies] ructe = "0.13.0" -vergen = "3.2.0" +vergen = { version = "4.1.0", default-features = false, features = ["git"] } [dev-dependencies] tempfile = "3.2.0" diff --git a/build.rs b/build.rs index bf5680e..831db6b 100644 --- a/build.rs +++ b/build.rs @@ -2,11 +2,11 @@ extern crate ructe; extern crate vergen; use ructe::Ructe; -use vergen::{generate_cargo_keys, ConstantsFlags}; +use vergen::{gen, ConstantsFlags}; fn main() { let flags = ConstantsFlags::SHA_SHORT; - generate_cargo_keys(flags).expect("Unable to generate the cargo keys!"); + gen(flags).expect("Unable to generate the cargo keys!"); Ructe::from_env() .expect("ructe") .compile_templates("templates") diff --git a/src/statics.rs b/src/statics.rs index 387fdc6..0f6f3ed 100644 --- a/src/statics.rs +++ b/src/statics.rs @@ -7,7 +7,7 @@ pub struct VersionInfo<'a> { } pub(crate) const VERSION_INFO: VersionInfo = VersionInfo { - commit: env!("VERGEN_SHA_SHORT"), + commit: env!("VERGEN_GIT_SHA_SHORT"), version: env!("CARGO_PKG_VERSION"), }; pub(crate) const CSS: &str = include_str!("../static/tacit-css.min.css");