diff options
| author | bors <bors@rust-lang.org> | 2023-07-13 18:15:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-13 18:15:14 +0000 |
| commit | a161ab00dbf660dd587ee42a8c855bac94047ddb (patch) | |
| tree | e0615e207acf3fec0d089d1ec334e63c8bcb40cb /src/tools | |
| parent | 1b3e68692592d71938df8e7fd8e53fbe5e7ef58c (diff) | |
| parent | e8b0b1781d177ab4aa0dca80d3c648f47287d149 (diff) | |
| download | rust-a161ab00dbf660dd587ee42a8c855bac94047ddb.tar.gz rust-a161ab00dbf660dd587ee42a8c855bac94047ddb.zip | |
Auto merge of #113637 - Mark-Simulacrum:bootstrap-bump, r=ozkanonur
Bump bootstrap to 1.72 beta
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/build_helper/src/git.rs | 8 | ||||
| -rw-r--r-- | src/tools/collect-license-metadata/src/path_tree.rs | 5 | ||||
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/src/tools/build_helper/src/git.rs b/src/tools/build_helper/src/git.rs index 168633c8f63..66876e02c19 100644 --- a/src/tools/build_helper/src/git.rs +++ b/src/tools/build_helper/src/git.rs @@ -94,7 +94,9 @@ pub fn get_git_modified_files( git_dir: Option<&Path>, extensions: &Vec<&str>, ) -> Result<Option<Vec<String>>, String> { - let Ok(updated_master) = updated_master_branch(git_dir) else { return Ok(None); }; + let Ok(updated_master) = updated_master_branch(git_dir) else { + return Ok(None); + }; let git = || { let mut git = Command::new("git"); @@ -119,7 +121,9 @@ pub fn get_git_modified_files( /// Returns the files that haven't been added to git yet. pub fn get_git_untracked_files(git_dir: Option<&Path>) -> Result<Option<Vec<String>>, String> { - let Ok(_updated_master) = updated_master_branch(git_dir) else { return Ok(None); }; + let Ok(_updated_master) = updated_master_branch(git_dir) else { + return Ok(None); + }; let mut git = Command::new("git"); if let Some(git_dir) = git_dir { git.current_dir(git_dir); diff --git a/src/tools/collect-license-metadata/src/path_tree.rs b/src/tools/collect-license-metadata/src/path_tree.rs index 68b6cef6432..709d91897e6 100644 --- a/src/tools/collect-license-metadata/src/path_tree.rs +++ b/src/tools/collect-license-metadata/src/path_tree.rs @@ -155,7 +155,10 @@ impl Node<LicenseId> { name: child_name, children: child_children, license: child_license, - } = child else { continue }; + } = child + else { + continue; + }; if child_license != license { continue; diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 994156bdfd7..d67e9aaaa6e 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -596,7 +596,10 @@ pub fn line_directive<'line>( if ln.starts_with('[') { // A comment like `//[foo]` is specific to revision `foo` let Some(close_brace) = ln.find(']') else { - panic!("malformed condition directive: expected `{}[foo]`, found `{}`", comment, ln); + panic!( + "malformed condition directive: expected `{}[foo]`, found `{}`", + comment, ln + ); }; let lncfg = &ln[1..close_brace]; |
