rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix invalid path generation in rustdoc search

Browse Source
This commit is contained in:
Guillaume Gomez
2018-04-29 21:32:53 +02:00
parent 96e182833b
commit a876d28b4a
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustdoc/html/render.rs
View File

@@ -1427,7 +1427,7 @@ impl<'a> Cache {
} }
if let Some(ref item_name) = item.name { if let Some(ref item_name) = item.name {
let path = self.paths.get(&item.def_id) let path = self.paths.get(&item.def_id)
.map(|p| p.0.join("::").to_string()) .map(|p| p.0[..p.0.len() - 1].join("::"))
.unwrap_or("std".to_owned()); .unwrap_or("std".to_owned());
for alias in item.attrs.lists("doc") for alias in item.attrs.lists("doc")
.filter(|a| a.check_name("alias")) .filter(|a| a.check_name("alias"))

6
src/test/rustdoc-js/alias-2.js
View File

@@ -8,11 +8,13 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-order
const QUERY = '+'; const QUERY = '+';
const EXPECTED = { const EXPECTED = {
'others': [ 'others': [
{ 'path': 'std::ops::AddAssign', 'name': 'AddAssign' }, { 'path': 'std::ops', 'name': 'AddAssign' },
{ 'path': 'std::ops::Add', 'name': 'Add' }, { 'path': 'std::ops', 'name': 'Add' },
], ],
}; };

4
src/test/rustdoc-js/alias.js
View File

@@ -13,7 +13,7 @@ const QUERY = '[';
const EXPECTED = { const EXPECTED = {
'others': [ 'others': [
{ 'path': 'std', 'name': 'slice' }, { 'path': 'std', 'name': 'slice' },
{ 'path': 'std::ops::IndexMut', 'name': 'IndexMut' }, { 'path': 'std::ops', 'name': 'IndexMut' },
{ 'path': 'std::ops::Index', 'name': 'Index' }, { 'path': 'std::ops', 'name': 'Index' },
], ],
}; };