bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

rustdoc: Fix duplicated impls with generics

Browse source 
The same type can appear multiple times in impls so we need to use a set
to avoid adding it multiple times.
This commit is contained in:
Oliver Middleton 2017-10-29 18:21:20 +00:00
parent 7da9a5e178
commit 676b4bbdc4
2 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1325,7 +1325,7 @@ impl DocFolder for Cache {
// Figure out the id of this impl. This may map to a // Figure out the id of this impl. This may map to a
// primitive rather than always to a struct/enum. // primitive rather than always to a struct/enum.
// Note: matching twice to restrict the lifetime of the `i` borrow. // Note: matching twice to restrict the lifetime of the `i` borrow.
let mut dids = vec![]; let mut dids = FxHashSet();
if let clean::Item { inner: clean::ImplItem(ref i), .. } = item { if let clean::Item { inner: clean::ImplItem(ref i), .. } = item {
let masked_trait = i.trait_.def_id().map_or(false, let masked_trait = i.trait_.def_id().map_or(false,
|d| self.masked_crates.contains(&d.krate)); |d| self.masked_crates.contains(&d.krate));
@ -1335,7 +1335,7 @@ impl DocFolder for Cache {
clean::BorrowedRef { clean::BorrowedRef {
type_: box clean::ResolvedPath { did, .. }, .. type_: box clean::ResolvedPath { did, .. }, ..
} => { } => {
dids.push(did); dids.insert(did);
} }
ref t => { ref t => {
let did = t.primitive_type().and_then(|t| { let did = t.primitive_type().and_then(|t| {
@ -1343,7 +1343,7 @@ impl DocFolder for Cache {
}); });
if let Some(did) = did { if let Some(did) = did {
dids.push(did); dids.insert(did);
} }
} }
} }
@ -1352,7 +1352,7 @@ impl DocFolder for Cache {
if let Some(generics) = i.trait_.as_ref().and_then(|t| t.generics()) { if let Some(generics) = i.trait_.as_ref().and_then(|t| t.generics()) {
for bound in generics { for bound in generics {
if let Some(did) = bound.def_id() { if let Some(did) = bound.def_id() {
dids.push(did); dids.insert(did);
} }
} }
} }

25
src/test/rustdoc/issue-45584.rs Normal file
View file

@ -0,0 +1,25 @@
// 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.
#![crate_name = "foo"]
pub trait Bar<T, U> {}
// @has 'foo/struct.Foo1.html'
pub struct Foo1;
// @count - '//*[@class="impl"]' 1
// @has - '//*[@class="impl"]' "impl Bar<Foo1, &'static Foo1> for Foo1"
impl Bar<Foo1, &'static Foo1> for Foo1 {}
// @has 'foo/struct.Foo2.html'
pub struct Foo2;
// @count - '//*[@class="impl"]' 1
// @has - '//*[@class="impl"]' "impl Bar<&'static Foo2, Foo2> for u8"
impl Bar<&'static Foo2, Foo2> for u8 {}