-
Notifications
You must be signed in to change notification settings - Fork 12.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open impl blocks by default #84552
Open impl blocks by default #84552
Conversation
Some changes occurred in HTML/CSS/JS. |
// This test ensures that the impl blocks are open by default. | ||
goto: file://|DOC_PATH|/index.html | ||
wait-for: 5000 | ||
assert: ("#main > details.implementors-toggle", "open", "") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a test that intentionally fails to make sure this runs at all?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They are not run, that's for sure. Otherwise, it'd have failed a long time ago because of nojs-attr-pos.goml
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok. In the meantime, can you run it locally and make sure it passes?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This version didn't because I forgot to commit the one with the correct URL (struct.Foo.html
and not index.html
). But otherwise it works as expected.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you fix it to have the correct URL? I don't see the point of adding a test we know will fail.
While you're at it, can you update the other test to pass instead of removing it altogether?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Look at my comment below.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While you're at it, can you update the other test to pass instead of removing it altogether?
The test which fails checked for attributes toggles. Since they don't have toggles anymore, there is no point of keeping the test.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The test which fails checked for attributes toggles. Since they don't have toggles anymore, there is no point of keeping the test.
Can you instead test that it doesn't have toggles?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it be useful to check that something was removed? For example, if we put back toggles on attributes with a different DOM, the test would still be happy. Which is why it's simpler to enforce what exists over what doesn't. (Not sure if that makes sense said like this ><)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree with @GuillaumeGomez. When removing "code that does X," it's often tempting to add a test for "doesn't do X anymore." But the problem is there are a zillion ways it could wind up doing X again, and it's impossible to cover all of them (or even a reasonable fraction). It winds up adding to the test running time, and the burden of maintaining tests, without a corresponding benefit.
Also, I need to make some improvements on the test I added, so please don't r+ right now. :) |
49ba0ff
to
9b44c4b
Compare
I also added a fix for the expansion of the "blocks" based on the URL hash. |
src/librustdoc/html/static/main.js
Outdated
} else if (e.tagName === "DETAILS") { | ||
e.open = true; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As I understand it, we hide things during load because we're going to manipulate their DOM, and DOM manipulation on hidden things goes faster. The main DOM manipulation is adding the [+]
toggles. When we fully switch over to <details>
we won't need to hide portions of the DOM during load anymore.
I'd like to start doing that as we go. Rather than opening the <details>
tags on load, we should set them to the global default in our generated HTML, and on load we should hide or show them according to settings.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not all details should be opened by details. For example the traits implementations blocks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or did you mean that we should generate the <details>
with "open" directly? Still: we will need this JS in any case for when we press the global toggle.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I mean that for default-shown sections we should generate <details open>
.
I agree we need JS to make <details>
respond to the global toggle, but I believe that's already in place. And it wouldn't be in this chunk of code, which executes on load rather than in response to the global toggle.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right, I'll modify it then.
I just opened an issue about this (#84558), but it looks like this should fix it! Do you want to mark this PR as fixing that issue? |
@camelid I updated the PR message. :) |
…t instead of opening them with JS
@jsha Updated! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bors r+
Not sure it works as review comment. @bors: r=jsha |
📌 Commit 6c8969c has been approved by |
☀️ Test successful - checks-actions |
For anyone wondering what's going on with the nightly preventing getting this patch, that's tracked here: |
You can get the last rustdoc version if you remove rustfmt from your components (not ideal but it works). |
Fixes #84558.
Part of #84422.
As you can see on https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/context/struct.TyCtxt.html, impl blocks are currently not open by default whereas they should.
I also realized that a test was outdated so I removed it and opened #84550 because it seems like the rustdoc-gui test suite isn't run on CI...
cc @jyn514
r? @jsha