Skip to content

Commit f0d2905

Browse files
committed
warn the user if the upstream master branch has is old
fixes #129528
1 parent a60a9e5 commit f0d2905

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/bootstrap/src/core/build_steps/format.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::sync::mpsc::SyncSender;
77
use std::sync::Mutex;
88

99
use build_helper::ci::CiEnv;
10-
use build_helper::git::get_git_modified_files;
10+
use build_helper::git::{get_git_modified_files, warn_old_master_branch};
1111
use ignore::WalkBuilder;
1212

1313
use crate::core::builder::Builder;
@@ -93,7 +93,8 @@ fn get_modified_rs_files(build: &Builder<'_>) -> Result<Option<Vec<String>>, Str
9393
if !verify_rustfmt_version(build) {
9494
return Ok(None);
9595
}
96-
96+
warn_old_master_branch(&build.config.git_config(), &build.config.src)
97+
.map_err(|e| e.to_string())?;
9798
get_git_modified_files(&build.config.git_config(), Some(&build.config.src), &["rs"])
9899
}
99100

0 commit comments

Comments
 (0)