Skip to content

Commit ee319ba

Browse files
committed
Temporarily exclude crates that require nightly
This is a prelude to immunant#1220 . In the future, these crates can be split into their own workspace, in order to build them with nightly. In the meantime, exclude them, move the rust-toolchain.toml files into them, remove it from the top level, and start building the rest of the c2rust workspace with stable Rust instead. This will unblock further changes, such as migrating c2rust to current dependencies. Likewise, make CI scripts provision stable.
1 parent 3a4e872 commit ee319ba

9 files changed

+30
-704
lines changed

Cargo.lock

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

Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
[workspace]
22
resolver = "2"
33
members = [
4-
"analysis/runtime",
54
"c2rust",
6-
"c2rust-analyze",
75
"c2rust-asm-casts",
86
"c2rust-ast-builder",
97
"c2rust-ast-exporter",
@@ -12,14 +10,16 @@ members = [
1210
"c2rust-bitfields-derive",
1311
"c2rust-build-paths",
1412
"c2rust-transpile",
15-
"dynamic_instrumentation",
16-
"pdg",
1713
]
1814
exclude = [
15+
"analysis/runtime",
1916
"analysis/tests",
17+
"c2rust-analyze",
2018
"c2rust-macros",
2119
"c2rust-refactor",
20+
"dynamic_instrumentation",
2221
"examples",
22+
"pdg",
2323
"tests",
2424
]
2525

c2rust-analyze/rust-toolchain.toml

-1
This file was deleted.

c2rust-analyze/rust-toolchain.toml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[toolchain]
2+
channel = "nightly-2022-08-08"
3+
components = ["rustfmt", "rustc-dev", "rust-src", "miri", "rust-analyzer"]

c2rust-transpile/rust-toolchain.toml

-1
This file was deleted.

dynamic_instrumentation/rust-toolchain.toml

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[toolchain]
2+
channel = "nightly-2022-08-08"
3+
components = ["rustfmt", "rustc-dev", "rust-src", "miri", "rust-analyzer"]

rust-toolchain.toml

-3
This file was deleted.

scripts/docker_build.sh

+1-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ IMAGES["fedora:34"]="1"
2626
build_image() {
2727
BASE_IMAGE=${1}
2828
IMAGE_TAG=$(echo ${BASE_IMAGE} | tr -s :/ - ) # replace colons and slashes with hyphens
29-
30-
# pull the rust version out of ../rust-toolchain.toml to keep things synced
31-
RUST_TOOLCHAIN_FILE="$SCRIPT_DIR/../rust-toolchain.toml"
32-
RUST_VER=$($SCRIPT_DIR/query_toml.py toolchain.channel $RUST_TOOLCHAIN_FILE)
29+
RUST_VER=stable
3330

3431
docker pull "$BASE_IMAGE"
3532
docker build -f $SCRIPT_DIR/../docker/Dockerfile \

scripts/provision_mac.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,4 @@ python3 -m pip install --user --upgrade pip
2727
python3 -m pip install --user -r "$SCRIPT_DIR/requirements.txt"
2828

2929
# Rust and dependencies
30-
RUST_TOOLCHAIN_FILE="$SCRIPT_DIR/../rust-toolchain.toml"
31-
export RUST_VER=$($SCRIPT_DIR/query_toml.py toolchain.channel $RUST_TOOLCHAIN_FILE)
32-
"$SCRIPT_DIR/provision_rust.sh"
30+
RUST_VER=stable "$SCRIPT_DIR/provision_rust.sh"

scripts/provision_rust.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ source ~/.cargo/env
3131

3232
# rustfmt is required for c2rust-refactor tests
3333
# rustc-dev was added make sure it is installed on Azure/macOS-10.15
34-
rustup component add rustfmt-preview rustc-dev rust-src
34+
rustup component add rustfmt rustc-dev rust-src
3535

3636
# Make rustup directory world-writable so other test users can install new rust
3737
# versions

0 commit comments

Comments
 (0)