Skip to content

Commit

Permalink
Rollup merge of #58150 - GuillaumeGomez:dont-apply-impl-collapse-rule…
Browse files Browse the repository at this point in the history
…s-to-trait-impls, r=Manishearth

Don't apply impl block collapse rules to trait impls

Fixes #58147.

r? @QuietMisdreavus
  • Loading branch information
GuillaumeGomez authored Feb 7, 2019
2 parents 064b787 + 729e37d commit da8da5e
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions src/librustdoc/html/static/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -1935,9 +1935,9 @@ if (!DOMTokenList.prototype.remove) {
};
}

function implHider(addOrRemove) {
function implHider(addOrRemove, fullHide) {
return function(n) {
var is_method = hasClass(n, "method");
var is_method = hasClass(n, "method") || fullHide;
if (is_method || hasClass(n, "type")) {
if (is_method === true) {
if (addOrRemove) {
Expand Down Expand Up @@ -1991,7 +1991,7 @@ if (!DOMTokenList.prototype.remove) {
}
}
} else {
// we are collapsing the impl block
// we are collapsing the impl block(s).

var parentElem = toggle.parentNode;
relatedDoc = parentElem;
Expand All @@ -2006,7 +2006,7 @@ if (!DOMTokenList.prototype.remove) {
return;
}

// Hide all functions, but not associated types/consts
// Hide all functions, but not associated types/consts.

if (mode === "toggle") {
if (hasClass(relatedDoc, "fns-now-collapsed") ||
Expand All @@ -2017,16 +2017,17 @@ if (!DOMTokenList.prototype.remove) {
}
}

var dontApplyBlockRule = toggle.parentNode.parentNode.id !== "main";
if (action === "show") {
removeClass(relatedDoc, "fns-now-collapsed");
removeClass(docblock, "hidden-by-usual-hider");
onEachLazy(toggle.childNodes, adjustToggle(false));
onEachLazy(relatedDoc.childNodes, implHider(false));
onEachLazy(toggle.childNodes, adjustToggle(false, dontApplyBlockRule));
onEachLazy(relatedDoc.childNodes, implHider(false, dontApplyBlockRule));
} else if (action === "hide") {
addClass(relatedDoc, "fns-now-collapsed");
addClass(docblock, "hidden-by-usual-hider");
onEachLazy(toggle.childNodes, adjustToggle(true));
onEachLazy(relatedDoc.childNodes, implHider(true));
onEachLazy(toggle.childNodes, adjustToggle(true, dontApplyBlockRule);
onEachLazy(relatedDoc.childNodes, implHider(true, dontApplyBlockRule));
}
}
}
Expand Down

0 comments on commit da8da5e

Please sign in to comment.