diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2024-02-05 07:34:48 -0500 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2024-02-08 07:44:34 -0500 |
| commit | 9a5034a20ed8b055dc615271f9d9cf27f9e494f0 (patch) | |
| tree | 33978c4d51e3177a8f2023c8ab23e7c671900457 /src | |
| parent | 9784a14859aeffa2a3819566ccc77a28f9ae03be (diff) | |
| download | rust-9a5034a20ed8b055dc615271f9d9cf27f9e494f0.tar.gz rust-9a5034a20ed8b055dc615271f9d9cf27f9e494f0.zip | |
Step all bootstrap cfgs forward
This also takes care of other bootstrap-related changes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/src/lib.rs | 4 | ||||
| -rw-r--r-- | src/tools/coverage-dump/src/covfun.rs | 2 | ||||
| -rw-r--r-- | src/tools/miri/src/lib.rs | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs index 1336abf6c7a..836684ca20a 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs @@ -90,10 +90,6 @@ const EXTRA_CHECK_CFGS: &[(Option<Mode>, &str, Option<&[&'static str]>)] = &[ /* Extra values not defined in the built-in targets yet, but used in std */ (Some(Mode::Std), "target_env", Some(&["libnx"])), // (Some(Mode::Std), "target_os", Some(&[])), - // #[cfg(bootstrap)] zkvm - (Some(Mode::Std), "target_os", Some(&["zkvm"])), - // #[cfg(bootstrap)] risc0 - (Some(Mode::Std), "target_vendor", Some(&["risc0"])), (Some(Mode::Std), "target_arch", Some(&["spirv", "nvptx", "xtensa"])), /* Extra names used by dependencies */ // FIXME: Used by serde_json, but we should not be triggering on external dependencies. diff --git a/src/tools/coverage-dump/src/covfun.rs b/src/tools/coverage-dump/src/covfun.rs index 3a5866dea3e..49e3a6ed583 100644 --- a/src/tools/coverage-dump/src/covfun.rs +++ b/src/tools/coverage-dump/src/covfun.rs @@ -219,7 +219,7 @@ impl CovTerm { enum MappingKind { Code(CovTerm), Gap(CovTerm), - Expansion(u32), + Expansion(#[allow(dead_code)] u32), Skip, // Using raw identifiers here makes the dump output a little bit nicer // (via the derived Debug), at the expense of making this tool's source diff --git a/src/tools/miri/src/lib.rs b/src/tools/miri/src/lib.rs index 057b883a3bf..a8e1ed2096e 100644 --- a/src/tools/miri/src/lib.rs +++ b/src/tools/miri/src/lib.rs @@ -10,7 +10,7 @@ #![feature(nonzero_ops)] #![feature(let_chains)] #![feature(lint_reasons)] -#![cfg_attr(not(bootstrap), feature(trait_upcasting))] +#![feature(trait_upcasting)] // Configure clippy and other lints #![allow( clippy::collapsible_else_if, |