From cc44ce0a3f379bc6e8a4078ee6f0b1a4237fa975 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 21 Apr 2021 14:20:56 +0200 Subject: [PATCH] Correctly handle --open argument on doc command --- src/bootstrap/doc.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs index dc96fd819d558..50370a5ffb608 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -479,12 +479,16 @@ impl Step for Std { // Look for library/std, library/core etc in the `x.py doc` arguments and // open the corresponding rendered docs. for path in builder.paths.iter().map(components_simplified) { - if path.get(0) == Some(&"library") { - let requested_crate = &path[1]; - if krates.contains(&requested_crate) { - let index = out.join(requested_crate).join("index.html"); - open(builder, &index); - } + let requested_crate = if path.get(0) == Some(&"library") { + &path[1] + } else if !path.is_empty() { + &path[0] + } else { + continue; + }; + if krates.contains(&requested_crate) { + let index = out.join(requested_crate).join("index.html"); + open(builder, &index); } } }