Skip to content

Commit 5d01a6b

Browse files
committed
Auto merge of rust-lang#2916 - ehuss:remove-workspace-hack, r=RalfJung
Remove rustc-workspace-hack The `rustc-workspace-hack` dependency was removed in rust-lang#109133 and should no longer be needed.
2 parents c1a7783 + 53187d7 commit 5d01a6b

File tree

4 files changed

+0
-23
lines changed

4 files changed

+0
-23
lines changed

src/tools/miri/Cargo.lock

-7
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,6 @@ dependencies = [
442442
"measureme",
443443
"rand",
444444
"regex",
445-
"rustc-workspace-hack",
446445
"rustc_version",
447446
"smallvec",
448447
"ui_test",
@@ -628,12 +627,6 @@ version = "1.1.0"
628627
source = "registry+https://github.com/rust-lang/crates.io-index"
629628
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
630629

631-
[[package]]
632-
name = "rustc-workspace-hack"
633-
version = "1.0.0"
634-
source = "registry+https://github.com/rust-lang/crates.io-index"
635-
checksum = "fc71d2faa173b74b232dedc235e3ee1696581bb132fc116fa3626d6151a1a8fb"
636-
637630
[[package]]
638631
name = "rustc_version"
639632
version = "0.4.0"

src/tools/miri/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ log = "0.4"
2424
rand = "0.8"
2525
smallvec = "1.7"
2626

27-
# A noop dependency that changes in the Rust repository, it's a bit of a hack.
28-
# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
29-
# for more information.
30-
rustc-workspace-hack = "1.0.0"
3127
measureme = "10.0.0"
3228
ctrlc = "3.2.5"
3329

src/tools/miri/cargo-miri/Cargo.lock

-7
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ dependencies = [
3030
"cargo_metadata",
3131
"directories",
3232
"rustc-build-sysroot",
33-
"rustc-workspace-hack",
3433
"rustc_tools_util",
3534
"rustc_version",
3635
"serde",
@@ -235,12 +234,6 @@ dependencies = [
235234
"tempfile",
236235
]
237236

238-
[[package]]
239-
name = "rustc-workspace-hack"
240-
version = "1.0.0"
241-
source = "registry+https://github.com/rust-lang/crates.io-index"
242-
checksum = "fc71d2faa173b74b232dedc235e3ee1696581bb132fc116fa3626d6151a1a8fb"
243-
244237
[[package]]
245238
name = "rustc_tools_util"
246239
version = "0.3.0"

src/tools/miri/cargo-miri/Cargo.toml

-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ serde_json = "1.0.40"
2020
cargo_metadata = "0.15.0"
2121
rustc-build-sysroot = "0.4.1"
2222

23-
# A noop dependency that changes in the Rust repository, it's a bit of a hack.
24-
# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
25-
# for more information.
26-
rustc-workspace-hack = "1.0.0"
27-
2823
# Enable some feature flags that dev-dependencies need but dependencies
2924
# do not. This makes `./miri install` after `./miri build` faster.
3025
serde = { version = "*", features = ["derive"] }

0 commit comments

Comments
 (0)