bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #54097 - GuillaumeGomez:remove-keyword-namespace, r=QuietMisdreavus

Browse source 
rustdoc: Remove namespace for keywords

Fixes #54084.

r? @QuietMisdreavus
This commit is contained in:
Guillaume Gomez 2018-09-18 10:21:35 +02:00 • committed by GitHub
commit 6aed133ebd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustdoc/html/render.rs
View file

@ -1830,8 +1830,8 @@ impl Context {
*slot.borrow_mut() = self.current.clone();
});
let mut title = if it.is_primitive() {
// No need to include the namespace for primitive types
let mut title = if it.is_primitive() || it.is_keyword() {
// No need to include the namespace for primitive types and keywords
String::new()
} else {
self.current.join("::")

1
src/test/rustdoc/keyword.rs
View file

@ -15,6 +15,7 @@
// @has foo/index.html '//h2[@id="keywords"]' 'Keywords'
// @has foo/index.html '//a[@href="keyword.match.html"]' 'match'
// @has foo/keyword.match.html '//a[@class="keyword"]' 'match'
// @has foo/keyword.match.html '//span[@class="in-band"]' 'Keyword match'
// @has foo/keyword.match.html '//section[@id="main"]//div[@class="docblock"]//p' 'this is a test!'
// @!has foo/index.html '//a/@href' 'foo/index.html'
// @!has foo/foo/index.html