From badda06bc6f6eefc6f3f8ce2d397d4fc0ab2d82d Mon Sep 17 00:00:00 2001 From: binarycat Date: Sun, 25 Aug 2024 13:25:27 -0400 Subject: [PATCH] warn the user if the upstream branch has is old fixes https://github.com/rust-lang/rust/issues/129528 --- src/bootstrap/src/core/build_steps/format.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/src/core/build_steps/format.rs b/src/bootstrap/src/core/build_steps/format.rs index 8c52df78ab685..1e78583476ad6 100644 --- a/src/bootstrap/src/core/build_steps/format.rs +++ b/src/bootstrap/src/core/build_steps/format.rs @@ -7,7 +7,7 @@ use std::sync::mpsc::SyncSender; use std::sync::Mutex; use build_helper::ci::CiEnv; -use build_helper::git::get_git_modified_files; +use build_helper::git::{get_git_modified_files, warn_old_master_branch}; use ignore::WalkBuilder; use crate::core::builder::Builder; @@ -93,7 +93,8 @@ fn get_modified_rs_files(build: &Builder<'_>) -> Result>, Str if !verify_rustfmt_version(build) { return Ok(None); } - + warn_old_master_branch(&build.config.git_config(), &build.config.src) + .map_err(|e| e.to_string())?; get_git_modified_files(&build.config.git_config(), Some(&build.config.src), &["rs"]) }