mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dont use --merge-base during bootstrap formatting subcommand

Browse Source
This commit is contained in:
Michael Goulet 2022-12-30 22:43:54 +00:00
parent 7c991868c6
commit e2c5999265
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/bootstrap/format.rs
View File

@ -79,24 +79,19 @@ fn update_rustfmt_version(build: &Builder<'_>) {
/// ///
/// Returns `None` if all files should be formatted. /// Returns `None` if all files should be formatted.
fn get_modified_rs_files(build: &Builder<'_>) -> Option<Vec<String>> { fn get_modified_rs_files(build: &Builder<'_>) -> Option<Vec<String>> {
let Ok(remote) = get_rust_lang_rust_remote() else {return None;}; let Ok(remote) = get_rust_lang_rust_remote() else { return None; };
if !verify_rustfmt_version(build) { if !verify_rustfmt_version(build) {
return None; return None;
} }
let merge_base =
output(build.config.git().arg("merge-base").arg(&format!("{remote}/master")).arg("HEAD"));
Some( Some(
output( output(build.config.git().arg("diff-index").arg("--name-only").arg(merge_base.trim()))
build .lines()
.config .map(|s| s.trim().to_owned())
.git() .filter(|f| Path::new(f).extension().map_or(false, |ext| ext == "rs"))
.arg("diff-index") .collect(),
.arg("--name-only")
.arg("--merge-base")
.arg(&format!("{remote}/master")),
)
.lines()
.map(|s| s.trim().to_owned())
.filter(|f| Path::new(f).extension().map_or(false, |ext| ext == "rs"))
.collect(),
) )
} }