Skip to content

Improve error output in case nodejs or npm is not installed for rustdoc-gui test suite #140556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 2, 2025
Merged

Improve error output in case nodejs or npm is not installed for rustdoc-gui test suite #140556

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/tools/rustdoc-gui-test/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ pub(crate) struct Config {
impl Config {
pub(crate) fn from_args(args: Vec<String>) -> Self {
let mut opts = Options::new();
opts.reqopt("", "nodejs", "absolute path of nodejs", "PATH")
.reqopt("", "npm", "absolute path of npm", "PATH")
opts.optopt("", "nodejs", "absolute path of nodejs", "PATH")
.optopt("", "npm", "absolute path of npm", "PATH")
.reqopt("", "out-dir", "output path of doc compilation", "PATH")
.reqopt("", "rust-src", "root source of the rust source", "PATH")
.reqopt(
Expand All @@ -47,9 +47,18 @@ impl Config {
Err(f) => panic!("{:?}", f),
};

let Some(nodejs) = matches.opt_str("nodejs").map(PathBuf::from) else {
eprintln!("`nodejs` was not provided. If not available, please install it");
std::process::exit(1);
};
let Some(npm) = matches.opt_str("npm").map(PathBuf::from) else {
eprintln!("`npm` was not provided. If not available, please install it");
std::process::exit(1);
};

Self {
nodejs: matches.opt_str("nodejs").map(PathBuf::from).expect("nodejs isn't available"),
npm: matches.opt_str("npm").map(PathBuf::from).expect("npm isn't available"),
nodejs,
npm,
rust_src: matches.opt_str("rust-src").map(PathBuf::from).unwrap(),
out_dir: matches.opt_str("out-dir").map(PathBuf::from).unwrap(),
initial_cargo: matches.opt_str("initial-cargo").map(PathBuf::from).unwrap(),
Expand Down
Loading