Skip to content

Commit f14cfc9

Browse files
committed
---
yaml --- r: 83522 b: refs/heads/try c: a925762 h: refs/heads/master v: v3
1 parent 4303ebf commit f14cfc9

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
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: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
5-
refs/heads/try: c5e03bec4d1e7655fc0fd13922fbebb3001f6bac
5+
refs/heads/try: a925762c3b1c1f7b3a272b7294c0ec9b4eb4fb6d
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: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,12 @@ impl<'self> DocFolder for Cache {
259259
if self.parent_stack.len() == 0 {
260260
None
261261
} else {
262-
Some((Some(*self.parent_stack.last()),
263-
self.stack.as_slice()))
262+
let last = self.parent_stack.last();
263+
let amt = match self.paths.find(last) {
264+
Some(&(_, "trait")) => self.stack.len() - 1,
265+
Some(*) | None => self.stack.len(),
266+
};
267+
Some((Some(*last), self.stack.slice_to(amt)))
264268
}
265269
}
266270
_ => Some((None, self.stack.as_slice()))

0 commit comments

Comments
 (0)