about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-04-25 07:20:16 +0000
committerbors <bors@rust-lang.org>2024-04-25 07:20:16 +0000
commite22a73c6d0c1173b8f3309bae43b9bea1df3c36b (patch)
treed94c9cb7e60d3fdc6492e50ded6c4dcf0e2ac506
parent9d7a47fe31c049d32989ee41efec61b57ea1a4e0 (diff)
parent8c24fe108530bcba2d61ce1ca0bbc672edb23ca2 (diff)
downloadrust-e22a73c6d0c1173b8f3309bae43b9bea1df3c36b.tar.gz
rust-e22a73c6d0c1173b8f3309bae43b9bea1df3c36b.zip
Auto merge of #3512 - RalfJung:miri-script-build, r=RalfJung
make miri-script a workspace root

This is needed to make miri-script build on stable (as is done by the `./miri` script) when the parent package uses unstable cargo features.
-rw-r--r--src/tools/miri/miri-script/Cargo.toml4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/miri/miri-script/Cargo.toml b/src/tools/miri/miri-script/Cargo.toml
index aaa788d5846..79d0b13600d 100644
--- a/src/tools/miri/miri-script/Cargo.toml
+++ b/src/tools/miri/miri-script/Cargo.toml
@@ -8,7 +8,9 @@ version = "0.1.0"
 default-run = "miri-script"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[workspace]
+# We make this a workspace root so that cargo does not go looking in ../Cargo.toml for the workspace root.
+# This is needed to make this package build on stable when the parent package uses unstable cargo features.
 
 [dependencies]
 which = "4.4"