-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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
rustdoc: revert deref recur to resume inclusion of impl ExtTrait<Local> for ExtType #84867
Conversation
r? @CraftSpider (rust-highfive has picked a reviewer for you, use r? to override) |
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.
@pnkfelix can you also revert this on nightly? I don't feel comfortable having different behavior on beta, the underlying issue won't be fixed by the next release.
fn as_ref(&self) -> &Local { | ||
todo!() | ||
} | ||
} |
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.
Thanks for this test case :)
Oh, this is for nightly - I guess it needs to be backported to beta. |
@bors r+ |
📌 Commit 47d606fc82cedb4602ddcd284c1e37e73525176e has been approved by |
Err I guess CI is failing - do you mind fixing it real quick? @bors r- |
This comment has been minimized.
This comment has been minimized.
src/librustdoc/html/render/mod.rs
Outdated
let inner_impl = target | ||
.def_id_full(c) | ||
let inner_impl = target.def_id_full(c); | ||
debug!("target.def_id_full: {:?}", inner_impl); |
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.
(sigh, I wonder if this extra debugging lines were part of why this didn't backport cleanly...)
I'm unilaterally beta-accepting this. Even though its somewhat hand-crafted, its almost entirely based on eyeball review of PR #80653 , so I think it is in the spirit of the revert that the T-compiler team agreed upon in last week's triage meeting. |
the beta-targeted version is PR #84868 |
(looking at CI failure now) |
oh. good old tidy. (I usually automatically run tidy, but I think there's some reason that I cannot run tidy when I'm targetting beta channel, at least when I do it and actually choose |
(this will give me a chance to remove the |
47d606f
to
86e3f76
Compare
@bors r=jyn514 |
📌 Commit 86e3f76 has been approved by |
The job Click to see the possible cause of the failure (guessed by this bot)
|
💔 Test failed - checks-actions |
@bors retry |
Sorry, meant to review this when you fixed the merge conflict, but it slipped through. Thanks joshua for handling this |
☀️ Test successful - checks-actions |
…ulacrum [beta] Bootstrap from stable This is the follow up to master/beta promotion, as well as the first round of backports: * Revert "Allow specifying alignment for functions rust-lang#81234" * Revert rust-lang#85176 addition of clone_from for ManuallyDrop rust-lang#85758 * rustdoc: revert deref recur to resume inclusion of impl ExtTrait<Local> for ExtType rust-lang#84867 * [beta] Update cargo rust-lang#86563 r? `@Mark-Simulacrum`
As discussed here: #82465 (comment), Revert PR #80653 to resolve issue #82465.
Issue #82465 was we had stopped including certain trait implementations, namely implementations on an imported type of an imported trait instantiated on a local type. That bug was injected by PR #80653.
Reverting #80653 means we don't list all the methods that you have accessible via recursively applying
Deref
.Discussion in last week's rustc triage meeting led us to conclude that the bug was worse than the enhancement, and there was not an obvious fix for the bug itself. So for the short term we remove the enhancement, while in the long term we will work on figuring out a way to have our imported trait implementation cake and eat it too.