Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .sync/rust/Makefiles/Makefile-patina-mtrr.toml
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,11 @@ args = ["test", "@@split(CARGO_MAKE_TASK_ARGS,;)"]
description = "Run tests and collect coverage data without generating reports."
install_crate = false
clear = true
# `coverage_attribute` is deliberately excluded from the default allow-features in
# .cargo/config.toml so ungated `#[coverage(off)]` fails to compile. Coverage runs set the
# `coverage_nightly` cfg (set by cargo-llvm-cov), which needs the feature, so re-add it here.
# Note: RUSTFLAGS replaces build.rustflags.
env = { RUSTFLAGS = "-Z allow-features=c_variadic,allocator_api,coverage_attribute" }
command = "cargo"
args = ["llvm-cov", "@@split(COV_FLAGS, )", "--no-report", "--doctests"]
dependencies = ["llvm-cov-clean"]
Expand Down
5 changes: 5 additions & 0 deletions .sync/rust/Makefiles/Makefile-patina-paging.toml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,11 @@ args = ["test", "@@split(CARGO_MAKE_TASK_ARGS,;)"]
description = "Run tests and collect coverage data without generating reports."
install_crate = false
clear = true
# `coverage_attribute` is deliberately excluded from the default allow-features in
# .cargo/config.toml so ungated `#[coverage(off)]` fails to compile. Coverage runs set the
# `coverage_nightly` cfg (set by cargo-llvm-cov), which needs the feature, so re-add it here.
# Note: RUSTFLAGS replaces build.rustflags.
env = { RUSTFLAGS = "-Z allow-features=c_variadic,allocator_api,coverage_attribute" }
command = "cargo"
args = ["llvm-cov", "@@split(COV_FLAGS, )", "--no-report", "--doctests"]
dependencies = ["llvm-cov-clean"]
Expand Down
5 changes: 5 additions & 0 deletions .sync/rust/Makefiles/Makefile-patina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,11 @@ args = ["test", "@@split(CARGO_MAKE_TASK_ARGS,;)"]
description = "Run tests and collect coverage data without generating reports."
install_crate = false
clear = true
# `coverage_attribute` is deliberately excluded from the default allow-features in
# .cargo/config.toml so ungated `#[coverage(off)]` fails to compile. Coverage runs set the
# `coverage_nightly` cfg (set by cargo-llvm-cov), which needs the feature, so re-add it here.
# Note: RUSTFLAGS replaces build.rustflags.
env = { RUSTFLAGS = "-Z allow-features=c_variadic,allocator_api,coverage_attribute" }
command = "cargo"
args = ["llvm-cov", "@@split(COV_FLAGS, )", "--no-report", "--doctests"]
dependencies = ["individual-package-targets", "llvm-cov-clean"]
Expand Down
11 changes: 8 additions & 3 deletions .sync/rust/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@ RUSTC_BOOTSTRAP = "1"
# they fail with E0725. If you must run `-Zbuild-std`, override rustflags for that invocation with
# the RUSTFLAGS env var (which replaces these config rustflags), keeping everything else but dropping
# `-Z allow-features`.
#
# Note: `coverage_attribute` is intentionally not in this list. It is only set in allow-features
# when running coverage.
[build]
rustflags = [
"-Z", "allow-features=c_variadic,allocator_api,coverage_attribute",
"-Z", "allow-features=c_variadic,allocator_api",
]

[profile.dev]
Expand Down Expand Up @@ -78,7 +81,8 @@ rustflags = [
# Preserve stack unwind info
"-C", "force-unwind-tables",
# Restrict the unstable features RUSTC_BOOTSTRAP unlocks to the accepted set
"-Z", "allow-features=c_variadic,allocator_api,coverage_attribute",
# (coverage_attribute excluded on purpose; coverage runs add it via RUSTFLAGS)
"-Z", "allow-features=c_variadic,allocator_api",
]

[target.aarch64-unknown-uefi]
Expand All @@ -90,5 +94,6 @@ rustflags = [
# Preserve stack unwind info
"-C", "force-unwind-tables",
# Restrict the unstable features RUSTC_BOOTSTRAP unlocks to the accepted set
"-Z", "allow-features=c_variadic,allocator_api,coverage_attribute",
# (coverage_attribute excluded on purpose; coverage runs add it via RUSTFLAGS)
"-Z", "allow-features=c_variadic,allocator_api",
]
Loading