Skip to content
Permalink
Browse files

Prevent panic when sysroot cannot be computed

  • Loading branch information...
GuillaumeGomez committed Jun 2, 2019
1 parent 8b36867 commit ab277a439b75af677877494a13db65b9e4d125ec
Showing with 2 additions and 4 deletions.
  1. +2 −4 src/librustdoc/test.rs
@@ -44,8 +44,7 @@ pub fn run(options: Options) -> i32 {
let input = config::Input::File(options.input.clone());

let sessopts = config::Options {
maybe_sysroot: options.maybe_sysroot.clone().or_else(
|| Some(env::current_exe().unwrap().parent().unwrap().parent().unwrap().to_path_buf())),
maybe_sysroot: options.maybe_sysroot.clone(),
search_paths: options.libs.clone(),
crate_types: vec![config::CrateType::Dylib],
cg: options.codegen_options.clone(),
@@ -225,8 +224,7 @@ fn run_test(
let outputs = OutputTypes::new(&[(OutputType::Exe, None)]);

let sessopts = config::Options {
maybe_sysroot: maybe_sysroot.or_else(
|| Some(env::current_exe().unwrap().parent().unwrap().parent().unwrap().to_path_buf())),
maybe_sysroot,
search_paths: libs,
crate_types: vec![config::CrateType::Executable],
output_types: outputs,

0 comments on commit ab277a4

Please sign in to comment.
You can’t perform that action at this time.