Skip to content

internal: xtask reformat ignore nightly dates #23391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChayimFriedman2 merged 1 commit into from
Sep 22, 2026
Merged

internal: xtask reformat ignore nightly dates #23391

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions xtask/src/codegen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,19 @@ fn reformat(text: String) -> String {
let rustfmt_toml = project_root().join("rustfmt.toml");
let toolchain = &std::env::var("RUSTFMT_TOOLCHAIN").unwrap_or("stable".to_owned());
let version = cmd!(sh, "rustup run {toolchain} rustfmt --version").read().unwrap_or_default();
let toolchain_matches = |version: &str| {
if version.contains(toolchain) {
return true;
}
// Nightly date cannot be accurately matched
toolchain.starts_with("nightly-") && version.contains("nightly")
};

// First try explicitly requesting the stable channel via rustup in case nightly is being used by default,
// then plain rustfmt in case rustup isn't being used to manage the compiler (e.g. when using Nix).
let mut stdout = if !version.contains(toolchain) {
let mut stdout = if !toolchain_matches(&version) {
let version = cmd!(sh, "rustfmt --version").read().unwrap_or_default();
if !version.contains(toolchain) {
if !toolchain_matches(&version) {
panic!(
"Failed to run rustfmt from toolchain '{toolchain}'. \
Please run `rustup component add rustfmt --toolchain {toolchain}` to install it.",
Expand Down
Loading