bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #106314 - jyn514:fix-panic, r=jyn514

Browse source 
Fix panic on `x build --help`

Fixes https://github.com/rust-lang/rust/issues/106313. This avoids trying to run `get_help` unless we actually need to see the paths that are available for the subcommand.

This originally regressed in https://github.com/rust-lang/rust/pull/106166.
This commit is contained in:
Michael Goulet 2022-12-30 21:26:36 -08:00 • committed by GitHub
commit 7f930b4a54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/bootstrap/flags.rs
View file

@ -352,32 +352,32 @@ To learn more about a subcommand, run `./x.py <subcommand> -h`",
// fn usage() // fn usage()
let usage = |exit_code: i32, opts: &Options, verbose: bool, subcommand_help: &str| -> ! { let usage = |exit_code: i32, opts: &Options, verbose: bool, subcommand_help: &str| -> ! {
// We have an unfortunate situation here: some Steps use `builder.in_tree_crates` to determine their paths.
// To determine those crates, we need to run `cargo metadata`, which means we need all submodules to be checked out.
// That takes a while to run, so only do it when paths were explicitly requested, not on all CLI errors.
// `Build::new` won't load submodules for the `setup` command.
let cmd = if verbose {
println!("note: updating submodules before printing available paths");
"build"
} else {
"setup"
};
let config = Config::parse(&[cmd.to_string()]);
let build = Build::new(config);
let paths = Builder::get_help(&build, subcommand);
println!("{}", opts.usage(subcommand_help)); println!("{}", opts.usage(subcommand_help));
if let Some(s) = paths { if verbose {
if verbose { // We have an unfortunate situation here: some Steps use `builder.in_tree_crates` to determine their paths.
// To determine those crates, we need to run `cargo metadata`, which means we need all submodules to be checked out.
// That takes a while to run, so only do it when paths were explicitly requested, not on all CLI errors.
// `Build::new` won't load submodules for the `setup` command.
let cmd = if verbose {
println!("note: updating submodules before printing available paths");
"build"
} else {
"setup"
};
let config = Config::parse(&[cmd.to_string()]);
let build = Build::new(config);
let paths = Builder::get_help(&build, subcommand);
if let Some(s) = paths {
println!("{}", s); println!("{}", s);
} else { } else {
println!( panic!("No paths available for subcommand `{}`", subcommand.as_str());
"Run `./x.py {} -h -v` to see a list of available paths.",
subcommand.as_str()
);
} }
} else if verbose { } else {
panic!("No paths available for subcommand `{}`", subcommand.as_str()); println!(
"Run `./x.py {} -h -v` to see a list of available paths.",
subcommand.as_str()
);
} }
crate::detail_exit(exit_code); crate::detail_exit(exit_code);
}; };