Skip to content

Commit 48060fe

Browse files
committed
Refactor use of vergen craate for 7.x
1 parent 82fadc3 commit 48060fe

File tree

4 files changed

+165
-33
lines changed

4 files changed

+165
-33
lines changed

Cargo.lock

+159-25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ repository = "dflemstr/rq"
2222
built = "0.5.1"
2323
env_logger = "0.9.0"
2424
regex = "1.3.1"
25-
vergen = "3.0.4"
25+
vergen = "7.0.0"
2626

2727
[dependencies]
2828
ansi_term = "0.12.1"

build.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
extern crate vergen;
2-
3-
use vergen::{generate_cargo_keys, ConstantsFlags};
1+
use vergen::{vergen, Config};
42

53
fn main() {
64
// Setup the flags, toggling off the 'SEMVER_FROM_CARGO_PKG' flag
7-
let mut flags = ConstantsFlags::all();
8-
flags.toggle(ConstantsFlags::SEMVER_FROM_CARGO_PKG);
5+
let mut flags = Config::default();
6+
*flags.build_mut().semver_mut() = false;
97

108
// Generate the 'cargo:' key output
11-
generate_cargo_keys(ConstantsFlags::all()).expect("Unable to generate the cargo keys!");
9+
vergen(flags).expect("Unable to generate the cargo keys!")
1210
}

src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub mod error;
2626
pub mod proto_index;
2727
pub mod value;
2828

29-
pub const VERSION: &str = env!("VERGEN_SEMVER");
29+
pub const VERSION: &str = env!("VERGEN_GIT_SEMVER");
3030

3131
#[doc(hidden)]
3232
#[deprecated(since = "1.0.1", note = "use VERSION instead")]

0 commit comments

Comments
 (0)