Skip to content

Commit

Permalink
Auto merge of rust-lang#42885 - ollie27:rustdoc_empty_glob_path, r=Gu…
Browse files Browse the repository at this point in the history
…illaumeGomez

rustdoc: Don't ICE on `use *;`

Fixes rust-lang#42875
  • Loading branch information
bors committed Jun 26, 2017
2 parents fc9ccfd + 9276259 commit 859c323
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/librustdoc/html/format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1019,7 +1019,11 @@ impl fmt::Display for clean::Import {
}
}
clean::Import::Glob(ref src) => {
write!(f, "use {}::*;", *src)
if src.path.segments.is_empty() {
write!(f, "use *;")
} else {
write!(f, "use {}::*;", *src)
}
}
}
}
Expand Down
23 changes: 23 additions & 0 deletions src/test/rustdoc/issue-42875.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// compile-flags: --no-defaults

#![crate_name = "foo"]

// @has foo/a/index.html '//code' 'use *;'
mod a {
use *;
}

// @has foo/b/index.html '//code' 'pub use *;'
pub mod b {
pub use *;
}

0 comments on commit 859c323

Please sign in to comment.