Skip to content

Commit

Permalink
treat the dev channel as nightly in compiletest
Browse files Browse the repository at this point in the history
  • Loading branch information
pietroalbini committed Apr 21, 2023
1 parent 1151ea6 commit 2bf5f77
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/tools/compiletest/src/header/cfg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,15 @@ pub(super) fn parse_cfg_name_directive<'a>(
message: "when the architecture is part of the Thumb family"
}

// Technically the locally built compiler uses the "dev" channel rather than the "nightly"
// channel, even though most people don't know or won't care about it. To avoid confusion, we
// treat the "dev" channel as the "nightly" channel when processing the directive.
condition! {
name: &config.channel,
name: if config.channel == "dev" { "nightly" } else { &config.channel },
allowed_names: &["stable", "beta", "nightly"],
message: "when the release channel is {name}",
}

condition! {
name: "cross-compile",
condition: config.target != config.host,
Expand Down

0 comments on commit 2bf5f77

Please sign in to comment.