Skip to content

Commit 859c323

Browse files
committed
Auto merge of #42885 - ollie27:rustdoc_empty_glob_path, r=GuillaumeGomez
rustdoc: Don't ICE on `use *;` Fixes #42875
2 parents fc9ccfd + 9276259 commit 859c323

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

src/librustdoc/html/format.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,11 @@ impl fmt::Display for clean::Import {
10191019
}
10201020
}
10211021
clean::Import::Glob(ref src) => {
1022-
write!(f, "use {}::*;", *src)
1022+
if src.path.segments.is_empty() {
1023+
write!(f, "use *;")
1024+
} else {
1025+
write!(f, "use {}::*;", *src)
1026+
}
10231027
}
10241028
}
10251029
}

src/test/rustdoc/issue-42875.rs

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// compile-flags: --no-defaults
12+
13+
#![crate_name = "foo"]
14+
15+
// @has foo/a/index.html '//code' 'use *;'
16+
mod a {
17+
use *;
18+
}
19+
20+
// @has foo/b/index.html '//code' 'pub use *;'
21+
pub mod b {
22+
pub use *;
23+
}

0 commit comments

Comments
 (0)