Skip to content

Commit

Permalink
Auto merge of rust-lang#2799 - klensy:dep-up, r=RalfJung
Browse files Browse the repository at this point in the history
cargo-miri: bump `rustc_tools_util` crate

This dedupes crate versions in rust repo.
  • Loading branch information
bors committed Feb 24, 2023
2 parents 2a979f8 + 9a32db7 commit 81490e1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/tools/miri/cargo-miri/Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ checksum = "fc71d2faa173b74b232dedc235e3ee1696581bb132fc116fa3626d6151a1a8fb"

[[package]]
name = "rustc_tools_util"
version = "0.2.1"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "598f48ce2a421542b3e64828aa742b687cc1b91d2f96591cfdb7ac5988cd6366"
checksum = "8ba09476327c4b70ccefb6180f046ef588c26a24cf5d269a9feba316eb4f029f"

[[package]]
name = "rustc_version"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/cargo-miri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ rustc-workspace-hack = "1.0.0"
serde = { version = "*", features = ["derive"] }

[build-dependencies]
rustc_tools_util = "0.2"
rustc_tools_util = "0.3"
9 changes: 1 addition & 8 deletions src/tools/miri/cargo-miri/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,5 @@ fn main() {
// Don't rebuild miri when nothing changed.
println!("cargo:rerun-if-changed=build.rs");
// gather version info
println!(
"cargo:rustc-env=GIT_HASH={}",
rustc_tools_util::get_commit_hash().unwrap_or_default()
);
println!(
"cargo:rustc-env=COMMIT_DATE={}",
rustc_tools_util::get_commit_date().unwrap_or_default()
);
rustc_tools_util::setup_version_info!();
}

0 comments on commit 81490e1

Please sign in to comment.