Skip to content

Commit 8465157

Browse files
committed
---
yaml --- r: 118195 b: refs/heads/try c: 287af7f h: refs/heads/master i: 118193: c359124 118191: e708ba1 v: v3
1 parent 7d60bde commit 8465157

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 3770c42a4959cbabc73da52abc7e3db96657974e
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: d6736a1440d42f6af967a8a20ab8d73522112b72
5-
refs/heads/try: e1e8db7e4a69825720fb1ae4478b6d29b447d994
5+
refs/heads/try: 287af7fa1a2230b25d2ffe98c5cc623ad34c6287
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustdoc/html/render.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ pub enum ExternalLocation {
108108

109109
/// Metadata about an implementor of a trait.
110110
pub struct Implementor {
111+
def_id: ast::DefId,
111112
generics: clean::Generics,
112113
trait_: clean::Type,
113114
for_: clean::Type,
@@ -531,6 +532,11 @@ fn write_shared(cx: &Context,
531532

532533
try!(write!(&mut f, r"implementors['{}'] = [", krate.name));
533534
for imp in imps.iter() {
535+
// If the trait and implementation are in the same crate, then
536+
// there's no need to emit information about it (there's inlining
537+
// going on). If they're in different crates then the crate defining
538+
// the trait will be interested in our implementation.
539+
if imp.def_id.krate == did.krate { continue }
534540
try!(write!(&mut f, r#""impl{} {} for {}","#,
535541
imp.generics, imp.trait_, imp.for_));
536542
}
@@ -759,6 +765,7 @@ impl DocFolder for Cache {
759765
Vec::new()
760766
});
761767
v.push(Implementor {
768+
def_id: item.def_id,
762769
generics: i.generics.clone(),
763770
trait_: i.trait_.get_ref().clone(),
764771
for_: i.for_.clone(),

0 commit comments

Comments
 (0)