Skip to content

Commit 2bf5f77

Browse files
committed
treat the dev channel as nightly in compiletest
1 parent 1151ea6 commit 2bf5f77

File tree

1 file changed

+5
-1
lines changed
  • src/tools/compiletest/src/header

1 file changed

+5
-1
lines changed

src/tools/compiletest/src/header/cfg.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,15 @@ pub(super) fn parse_cfg_name_directive<'a>(
165165
message: "when the architecture is part of the Thumb family"
166166
}
167167

168+
// Technically the locally built compiler uses the "dev" channel rather than the "nightly"
169+
// channel, even though most people don't know or won't care about it. To avoid confusion, we
170+
// treat the "dev" channel as the "nightly" channel when processing the directive.
168171
condition! {
169-
name: &config.channel,
172+
name: if config.channel == "dev" { "nightly" } else { &config.channel },
170173
allowed_names: &["stable", "beta", "nightly"],
171174
message: "when the release channel is {name}",
172175
}
176+
173177
condition! {
174178
name: "cross-compile",
175179
condition: config.target != config.host,

0 commit comments

Comments
 (0)