diff options
| author | Oliver Middleton <olliemail27@gmail.com> | 2017-10-29 18:21:20 +0000 |
|---|---|---|
| committer | Oliver Middleton <olliemail27@gmail.com> | 2017-10-29 18:21:20 +0000 |
| commit | 676b4bbdc40be39d12b811d6871c2df59e93cde9 (patch) | |
| tree | 66872fd2d705e39b51c0b824560756f4827ed180 | |
| parent | 7da9a5e178e28b2e387e6296aa1b0289acdf5781 (diff) | |
| download | rust-676b4bbdc40be39d12b811d6871c2df59e93cde9.tar.gz rust-676b4bbdc40be39d12b811d6871c2df59e93cde9.zip | |
rustdoc: Fix duplicated impls with generics
The same type can appear multiple times in impls so we need to use a set to avoid adding it multiple times.
| -rw-r--r-- | src/librustdoc/html/render.rs | 8 | ||||
| -rw-r--r-- | src/test/rustdoc/issue-45584.rs | 25 |
2 files changed, 29 insertions, 4 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index d538428a7e9..867ac0d0459 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -1325,7 +1325,7 @@ impl DocFolder for Cache { // Figure out the id of this impl. This may map to a // primitive rather than always to a struct/enum. // 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 { let masked_trait = i.trait_.def_id().map_or(false, |d| self.masked_crates.contains(&d.krate)); @@ -1335,7 +1335,7 @@ impl DocFolder for Cache { clean::BorrowedRef { type_: box clean::ResolvedPath { did, .. }, .. } => { - dids.push(did); + dids.insert(did); } ref t => { let did = t.primitive_type().and_then(|t| { @@ -1343,7 +1343,7 @@ impl DocFolder for Cache { }); 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()) { for bound in generics { if let Some(did) = bound.def_id() { - dids.push(did); + dids.insert(did); } } } diff --git a/src/test/rustdoc/issue-45584.rs b/src/test/rustdoc/issue-45584.rs new file mode 100644 index 00000000000..6d6ae3dc94a --- /dev/null +++ b/src/test/rustdoc/issue-45584.rs @@ -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 {} |
