about summary refs log tree commit diff
path: root/library/compiler-builtins/ci/run.sh
diff options
context:
space:
mode:
authorTrevor Gross <tmgross@umich.edu>2025-03-19 05:19:17 +0000
committerTrevor Gross <t.gross35@gmail.com>2025-03-19 00:49:34 -0500
commit683485cda22efc3514da4de730968e691e3a902f (patch)
tree8d7d34d0f763b07f9133a696d453380ddda77fb5 /library/compiler-builtins/ci/run.sh
parent3167cbb6d01e247ca679712fd923c7cfbc45d7fc (diff)
downloadrust-683485cda22efc3514da4de730968e691e3a902f.tar.gz
rust-683485cda22efc3514da4de730968e691e3a902f.zip
Switch repository layout to use a virtual manifest
The current setup has the `Cargo.toml` for `compiler-builtins` at the
repository root, which means all support crates and other files are
located within the package root. This works for now but is not the
cleanest setup since files that should or shouldn't be included in the
package need to be configured in `Cargo.toml`. If we eventually merge
`libm` development into this repository, it would be nice to make this
separation more straightforward.

Begin cleaning things up by moving the crate source to a new
`compiler-builtins` directory and adding a virtual manifest. For now the
`libm` submodule is also moved, but in the future it can likely move
back to the top level (ideally `compiler-builtins/src` would contain a
symlink to `libm/src/math`, but unfortunately it seems like Cargo does
not like something about the submodule + symlink combination).
Diffstat (limited to 'library/compiler-builtins/ci/run.sh')
-rwxr-xr-xlibrary/compiler-builtins/ci/run.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/library/compiler-builtins/ci/run.sh b/library/compiler-builtins/ci/run.sh
index 3625dde79ed..9abbf25a7e7 100755
--- a/library/compiler-builtins/ci/run.sh
+++ b/library/compiler-builtins/ci/run.sh
@@ -23,7 +23,7 @@ fi
 if [ "${NO_STD:-}" = "1" ]; then
     echo "nothing to do for no_std"
 else
-    run="cargo test --manifest-path testcrate/Cargo.toml --no-fail-fast --target $target"
+    run="cargo test --package testcrate --no-fail-fast --target $target"
     $run
     $run --release
     $run --features c
@@ -38,7 +38,7 @@ fi
 
 if [ "${TEST_VERBATIM:-}" = "1" ]; then
     verb_path=$(cmd.exe //C echo \\\\?\\%cd%\\testcrate\\target2)
-    cargo build --manifest-path testcrate/Cargo.toml \
+    cargo build --package testcrate \
         --target "$target" --target-dir "$verb_path" --features c
 fi