Auto merge of #127799 - Kobzol:bootstrap-cmd-refactor-7, r=onur-ozkan · rust-lang/rust@1b51d80 (original) (raw)

19 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -1481,7 +1481,7 @@ pub fn compiler_file(
1481 1481 let mut cmd = command(compiler);
1482 1482 cmd.args(builder.cflags(target, GitRepo::Rustc, c));
1483 1483 cmd.arg(format!("-print-file-name={file}"));
1484 -let out = cmd.capture_stdout().run(builder).stdout();
1484 +let out = cmd.run_capture_stdout(builder).stdout();
1485 1485 PathBuf::from(out.trim())
1486 1486 }
1487 1487
@@ -1845,7 +1845,7 @@ impl Step for Assemble {
1845 1845 builder.ensure(llvm::Llvm { target: target_compiler.host });
1846 1846 if !builder.config.dry_run() && builder.config.llvm_tools_enabled {
1847 1847 let llvm_bin_dir =
1848 -command(llvm_config).capture_stdout().arg("--bindir").run(builder).stdout();
1848 +command(llvm_config).arg("--bindir").run_capture_stdout(builder).stdout();
1849 1849 let llvm_bin_dir = Path::new(llvm_bin_dir.trim());
1850 1850
1851 1851 // Since we've already built the LLVM tools, install them to the sysroot.
@@ -2171,7 +2171,7 @@ pub fn strip_debug(builder: &Builder<'_>, target: TargetSelection, path: &Path)
2171 2171 }
2172 2172
2173 2173 let previous_mtime = t!(t!(path.metadata()).modified());
2174 -command("strip").capture().arg("--strip-debug").arg(path).run(builder);
2174 +command("strip").arg("--strip-debug").arg(path).run_capture(builder);
2175 2175
2176 2176 let file = t!(fs::File::open(path));
2177 2177
Original file line number Diff line number Diff line change
@@ -182,7 +182,7 @@ fn make_win_dist(
182 182 //Ask gcc where it keeps its stuff
183 183 let mut cmd = command(builder.cc(target));
184 184 cmd.arg("-print-search-dirs");
185 -let gcc_out = cmd.capture_stdout().run(builder).stdout();
185 +let gcc_out = cmd.run_capture_stdout(builder).stdout();
186 186
187 187 let mut bin_path: Vec<_> = env::split_paths(&env::var_os("PATH").unwrap_or_default()).collect();
188 188 let mut lib_path = Vec::new();
@@ -1067,7 +1067,7 @@ impl Step for PlainSourceTarball {
1067 1067 cmd.arg("--sync").arg(manifest_path);
1068 1068 }
1069 1069
1070 -let config = cmd.capture().run(builder).stdout();
1070 +let config = cmd.run_capture(builder).stdout();
1071 1071
1072 1072 let cargo_config_dir = plain_dst_src.join(".cargo");
1073 1073 builder.create_dir(&cargo_config_dir);
@@ -2075,7 +2075,7 @@ fn maybe_install_llvm(
2075 2075 let mut cmd = command(llvm_config);
2076 2076 cmd.arg("--libfiles");
2077 2077 builder.verbose(|
2078 -let files = cmd.capture_stdout().run(builder).stdout();
2078 +let files = cmd.run_capture_stdout(builder).stdout();
2079 2079 let build_llvm_out = &builder.llvm_out(builder.config.build);
2080 2080 let target_llvm_out = &builder.llvm_out(target);
2081 2081 for file in files.trim_end().split(' ') {
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ fn get_rustfmt_version(build: &Builder<'_>) -> Option<(String, PathBuf)> {
60 60 });
61 61 cmd.arg("--version");
62 62
63 -let output = cmd.capture().allow_failure().run(build);
63 +let output = cmd.allow_failure().run_capture(build);
64 64 if output.is_failure() {
65 65 return None;
66 66 }
@@ -160,25 +160,23 @@ pub fn format(build: &Builder<'_>, check: bool, all: bool, paths: &[PathBuf]) {
160 160 }
161 161 }
162 162 let git_available =
163 - helpers::git(None).capture().allow_failure().arg("--version").run(build).is_success();
163 + helpers::git(None).allow_failure().arg("--version").run_capture(build).is_success();
164 164
165 165 let mut adjective = None;
166 166 if git_available {
167 167 let in_working_tree = helpers::git(Some(&build.src))
168 -.capture()
169 168 .allow_failure()
170 169 .arg("rev-parse")
171 170 .arg("--is-inside-work-tree")
172 -.run(build)
171 +.run_capture(build)
173 172 .is_success();
174 173 if in_working_tree {
175 174 let untracked_paths_output = helpers::git(Some(&build.src))
176 -.capture_stdout()
177 175 .arg("status")
178 176 .arg("--porcelain")
179 177 .arg("-z")
180 178 .arg("--untracked-files=normal")
181 -.run(build)
179 +.run_capture_stdout(build)
182 180 .stdout();
183 181 let untracked_paths: Vec<_> = untracked_paths_output
184 182 .split_terminator('\0')
Original file line number Diff line number Diff line change
@@ -471,7 +471,7 @@ impl Step for Llvm {
471 471 builder.ensure(Llvm { target: builder.config.build });
472 472 if !builder.config.dry_run() {
473 473 let llvm_bindir =
474 -command(&llvm_config).capture_stdout().arg("--bindir").run(builder).stdout();
474 +command(&llvm_config).arg("--bindir").run_capture_stdout(builder).stdout();
475 475 let host_bin = Path::new(llvm_bindir.trim());
476 476 cfg.define(
477 477 "LLVM_TABLEGEN",
@@ -522,7 +522,7 @@ impl Step for Llvm {
522 522 // Helper to find the name of LLVM's shared library on darwin and linux.
523 523 let find_llvm_lib_name = |extension
524 524 let version =
525 -command(&res.llvm_config).capture_stdout().arg("--version").run(builder).stdout();
525 +command(&res.llvm_config).arg("--version").run_capture_stdout(builder).stdout();
526 526 let major = version.split('.').next().unwrap();
527 527
528 528 match &llvm_version_suffix {
@@ -578,7 +578,7 @@ fn check_llvm_version(builder: &Builder<'_>, llvm_config: &Path) {
578 578 return;
579 579 }
580 580
581 -let version = command(llvm_config).capture_stdout().arg("--version").run(builder).stdout();
581 +let version = command(llvm_config).arg("--version").run_capture_stdout(builder).stdout();
582 582 let mut parts = version.split('.').take(2).filter_map(|s
583 583 if let (Some(major), Some(_minor)) = (parts.next(), parts.next()) {
584 584 if major >= 17 {
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ impl Step for BuildManifest {
40 40 panic!("\n\nfailed to specify `dist.upload-addr` in `config.toml`\n\n")
41 41 });
42 42
43 -let today = command("date").capture_stdout().arg("+%Y-%m-%d").run(builder).stdout();
43 +let today = command("date").arg("+%Y-%m-%d").run_capture_stdout(builder).stdout();
44 44
45 45 cmd.arg(sign);
46 46 cmd.arg(distdir(builder));
Original file line number Diff line number Diff line change
@@ -275,7 +275,7 @@ impl Step for Link {
275 275 }
276 276
277 277 fn rustup_installed(builder: &Builder<'_>) -> bool {
278 -command("rustup").capture_stdout().arg("--version").run(builder).is_success()
278 +command("rustup").arg("--version").run_capture_stdout(builder).is_success()
279 279 }
280 280
281 281 fn stage_dir_exists(stage_path: &str) -> bool {
@@ -313,10 +313,9 @@ fn attempt_toolchain_link(builder: &Builder<'_>, stage_path: &str) {
313 313
314 314 fn toolchain_is_linked(builder: &Builder<'_>) -> bool {
315 315 match command("rustup")
316 -.capture_stdout()
317 316 .allow_failure()
318 317 .args(["toolchain", "list"])
319 -.run(builder)
318 +.run_capture_stdout(builder)
320 319 .stdout_if_ok()
321 320 {
322 321 Some(toolchain_list) => {
@@ -341,9 +340,8 @@ fn toolchain_is_linked(builder: &Builder<'_>) -> bool {
341 340
342 341 fn try_link_toolchain(builder: &Builder<'_>, stage_path: &str) -> bool {
343 342 command("rustup")
344 -.capture_stdout()
345 343 .args(["toolchain", "link", "stage1", stage_path])
346 -.run(builder)
344 +.run_capture_stdout(builder)
347 345 .is_success()
348 346 }
349 347
@@ -481,9 +479,8 @@ impl Step for Hook {
481 479 // install a git hook to automatically run tidy, if they want
482 480 fn install_git_hook_maybe(builder: &Builder<'_>, config: &Config) -> io::Result<()> {
483 481 let git = helpers::git(Some(&config.src))
484 -.capture()
485 482 .args(["rev-parse", "--git-common-dir"])
486 -.run(builder)
483 +.run_capture(builder)
487 484 .stdout();
488 485 let git = PathBuf::from(git.trim());
489 486 let hooks_dir = git.join("hooks");
Original file line number Diff line number Diff line change
@@ -14,10 +14,9 @@ pub fn suggest(builder: &Builder<'_>, run: bool) {
14 14 let git_config = builder.config.git_config();
15 15 let suggestions = builder
16 16 .tool_cmd(Tool::SuggestTests)
17 -.capture_stdout()
18 17 .env("SUGGEST_TESTS_GIT_REPOSITORY", git_config.git_repository)
19 18 .env("SUGGEST_TESTS_NIGHTLY_BRANCH", git_config.nightly_branch)
20 -.run(builder)
19 +.run_capture_stdout(builder)
21 20 .stdout();
22 21
23 22 let suggestions = suggestions
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ fn create_synthetic_target(
64 64 // we cannot use nightly features. So `RUSTC_BOOTSTRAP` is needed here.
65 65 cmd.env("RUSTC_BOOTSTRAP", "1");
66 66
67 -let output = cmd.capture().run(builder).stdout();
67 +let output = cmd.run_capture(builder).stdout();
68 68 let mut spec: serde_json::Value = serde_json::from_slice(output.as_bytes()).unwrap();
69 69 let spec_map = spec.as_object_mut().unwrap();
70 70