Skip to content

Commit 729e37d

Browse files
Don't apply impl block collapse rules to trait impls
1 parent 19f8958 commit 729e37d

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/librustdoc/html/static/main.js

+9-8
Original file line numberDiff line numberDiff line change
@@ -1918,9 +1918,9 @@ if (!DOMTokenList.prototype.remove) {
19181918
};
19191919
}
19201920

1921-
function implHider(addOrRemove) {
1921+
function implHider(addOrRemove, fullHide) {
19221922
return function(n) {
1923-
var is_method = hasClass(n, "method");
1923+
var is_method = hasClass(n, "method") || fullHide;
19241924
if (is_method || hasClass(n, "type")) {
19251925
if (is_method === true) {
19261926
if (addOrRemove) {
@@ -1974,7 +1974,7 @@ if (!DOMTokenList.prototype.remove) {
19741974
}
19751975
}
19761976
} else {
1977-
// we are collapsing the impl block
1977+
// we are collapsing the impl block(s).
19781978

19791979
var parentElem = toggle.parentNode;
19801980
relatedDoc = parentElem;
@@ -1989,7 +1989,7 @@ if (!DOMTokenList.prototype.remove) {
19891989
return;
19901990
}
19911991

1992-
// Hide all functions, but not associated types/consts
1992+
// Hide all functions, but not associated types/consts.
19931993

19941994
if (mode === "toggle") {
19951995
if (hasClass(relatedDoc, "fns-now-collapsed") ||
@@ -2000,16 +2000,17 @@ if (!DOMTokenList.prototype.remove) {
20002000
}
20012001
}
20022002

2003+
var dontApplyBlockRule = toggle.parentNode.parentNode.id !== "main";
20032004
if (action === "show") {
20042005
removeClass(relatedDoc, "fns-now-collapsed");
20052006
removeClass(docblock, "hidden-by-usual-hider");
2006-
onEachLazy(toggle.childNodes, adjustToggle(false));
2007-
onEachLazy(relatedDoc.childNodes, implHider(false));
2007+
onEachLazy(toggle.childNodes, adjustToggle(false, dontApplyBlockRule));
2008+
onEachLazy(relatedDoc.childNodes, implHider(false, dontApplyBlockRule));
20082009
} else if (action === "hide") {
20092010
addClass(relatedDoc, "fns-now-collapsed");
20102011
addClass(docblock, "hidden-by-usual-hider");
2011-
onEachLazy(toggle.childNodes, adjustToggle(true));
2012-
onEachLazy(relatedDoc.childNodes, implHider(true));
2012+
onEachLazy(toggle.childNodes, adjustToggle(true, dontApplyBlockRule);
2013+
onEachLazy(relatedDoc.childNodes, implHider(true, dontApplyBlockRule));
20132014
}
20142015
}
20152016
}

0 commit comments

Comments
 (0)