Skip to content

Commit 58cfc1c

Browse files
committed
treat the dev channel as nightly in compiletest
1 parent a27ea2b commit 58cfc1c

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,15 @@ pub(super) fn parse_cfg_name_directive<'a>(
130130
message: "when the architecture is part of the Thumb family"
131131
}
132132

133+
// Technically the locally built compiler uses the "dev" channel rather than the "nightly"
134+
// channel, even though most people don't know or won't care about it. To avoid confusion, we
135+
// treat the "dev" channel as the "nightly" channel when processing the directive.
133136
condition! {
134-
name: &config.channel,
137+
name: if config.channel == "dev" { "nightly" } else { &config.channel },
135138
allowed_names: &["stable", "beta", "nightly"],
136139
message: "when the release channel is {name}",
137140
}
141+
138142
condition! {
139143
name: "cross-compile",
140144
condition: config.target != config.host,

0 commit comments

Comments
 (0)