rustdoc: revert deref recur to resume inclusion of impl ExtTrait<Local> for ExtType #84867

pnkfelix · 2021-05-03T14:15:04Z

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.

rust-highfive · 2021-05-03T14:15:07Z

r? @CraftSpider

(rust-highfive has picked a reviewer for you, use r? to override)

jyn514

@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.

cc @GuillaumeGomez @jryans

jyn514 · 2021-05-03T14:33:18Z

src/test/rustdoc/issue-82465-asref-for-and-of-local.rs

+    fn as_ref(&self) -> &Local {
+        todo!()
+    }
+}


Thanks for this test case :)

jyn514 · 2021-05-03T14:34:54Z

Oh, this is for nightly - I guess it needs to be backported to beta.

jyn514 · 2021-05-03T14:35:05Z

@bors r+

bors · 2021-05-03T14:35:07Z

📌 Commit 47d606fc82cedb4602ddcd284c1e37e73525176e has been approved by jyn514

jyn514 · 2021-05-03T14:37:24Z

Err I guess CI is failing - do you mind fixing it real quick?

@bors r-

pnkfelix · 2021-05-03T14:51:11Z

src/librustdoc/html/render/mod.rs

-        let inner_impl = target
-            .def_id_full(c)
+        let inner_impl = target.def_id_full(c);
+        debug!("target.def_id_full: {:?}", inner_impl);


(sigh, I wonder if this extra debugging lines were part of why this didn't backport cleanly...)

pnkfelix · 2021-05-03T15:10:36Z

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.

pnkfelix · 2021-05-03T15:11:20Z

the beta-targeted version is PR #84868

pnkfelix · 2021-05-03T15:11:46Z

(looking at CI failure now)

pnkfelix · 2021-05-03T15:12:59Z

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 channel=beta in config.toml)

pnkfelix · 2021-05-03T15:16:08Z

(this will give me a chance to remove the debug! lines I left in by accident. 😄 )

pnkfelix · 2021-05-03T15:35:38Z

@bors r=jyn514

bors · 2021-05-03T15:35:39Z

📌 Commit 86e3f76 has been approved by jyn514

rust-log-analyzer · 2021-06-14T17:20:46Z

The job dist-x86_64-apple failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[  6%] Building CXX object lib/Core/CMakeFiles/lldCore.dir/DefinedAtom.cpp.o
[  7%] Building CXX object lib/Core/CMakeFiles/lldCore.dir/Error.cpp.o
[  8%] Building CXX object Common/CMakeFiles/lldCommon.dir/Args.cpp.o
error: Connection to server timed out
make[2]: *** [lib/Core/CMakeFiles/lldCore.dir/DefinedAtom.cpp.o] Error 2
make[2]: *** Waiting for unfinished jobs....
error: Connection to server timed out
error: Connection to server timed out
make[2]: *** [Common/CMakeFiles/lldCommon.dir/Args.cpp.o] Error 2
make[2]: *** Waiting for unfinished jobs....
error: Connection to server timed out
make[2]: *** [lib/Core/CMakeFiles/lldCore.dir/Error.cpp.o] Error 2
make[1]: *** [lib/Core/CMakeFiles/lldCore.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
clang-12: warning: argument unused during compilation: '-static-libstdc++' [-Wunused-command-line-argument]
make[1]: *** [Common/CMakeFiles/lldCommon.dir/all] Error 2
make: *** [all] Error 2
command did not execute successfully, got: exit status: 2


build script failed, must exit now', /Users/runner/.cargo/registry/src/github.com-1ecc6299db9ec823/cmake-0.1.44/src/lib.rs:885:5
 finished in 33.146 seconds
failed to run: /Users/runner/work/rust/rust/build/bootstrap/debug/bootstrap dist
Build completed unsuccessfully in 0:44:56

bors · 2021-06-14T17:21:21Z

💔 Test failed - checks-actions

jyn514 · 2021-06-14T20:19:24Z

@bors retry

bors · 2021-06-15T00:14:01Z

⌛ Testing commit b894f75 with merge d74b36e...

CraftSpider · 2021-06-15T00:24:11Z

Sorry, meant to review this when you fixed the merge conflict, but it slipped through. Thanks joshua for handling this

bors · 2021-06-15T02:54:45Z

☀️ Test successful - checks-actions
Approved by: jyn514
Pushing d74b36e to master...

…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`

rust-highfive assigned CraftSpider May 3, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 3, 2021

pnkfelix added beta-nominated Nominated for backporting to the compiler in the beta channel. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 3, 2021

jyn514 self-assigned this May 3, 2021

Mark-Simulacrum mentioned this pull request May 3, 2021

[stable] 1.52.0 release #84864

Merged

jyn514 approved these changes May 3, 2021

View reviewed changes

src/test/rustdoc/issue-82465-asref-for-and-of-local.rs

fn as_ref(&self) -> &Local {

todo!()

}

}

Copy link

Member

jyn514 May 3, 2021

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 :)

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 3, 2021

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 3, 2021

This comment has been minimized.

Sign in to view

pnkfelix commented May 3, 2021

View reviewed changes

pnkfelix mentioned this pull request May 3, 2021

[beta] rustdoc revert deref recur #84868

Closed

pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label May 3, 2021

pnkfelix force-pushed the rustdoc-revert-deref-recur branch from 47d606f to 86e3f76 Compare May 3, 2021 15:35

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 14, 2021

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 14, 2021

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 15, 2021

bors merged commit d74b36e into rust-lang:master Jun 15, 2021

rustbot added this to the 1.55.0 milestone Jun 15, 2021

jyn514 mentioned this pull request Jun 15, 2021

fix rustdoc stack overflow on mutually recursive Deref #86322

Merged

Mark-Simulacrum modified the milestones: 1.55.0, 1.54.0 Jun 17, 2021

Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 17, 2021

Mark-Simulacrum mentioned this pull request Jun 17, 2021

[beta] Bootstrap from stable #86413

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rustdoc: revert deref recur to resume inclusion of impl ExtTrait<Local> for ExtType #84867

rustdoc: revert deref recur to resume inclusion of impl ExtTrait<Local> for ExtType #84867

pnkfelix commented May 3, 2021 •

edited

rust-highfive commented May 3, 2021

jyn514 left a comment

jyn514 May 3, 2021

jyn514 commented May 3, 2021

jyn514 commented May 3, 2021

bors commented May 3, 2021

jyn514 commented May 3, 2021

This comment has been minimized.

pnkfelix May 3, 2021

pnkfelix commented May 3, 2021

pnkfelix commented May 3, 2021

pnkfelix commented May 3, 2021

pnkfelix commented May 3, 2021

pnkfelix commented May 3, 2021

pnkfelix commented May 3, 2021

bors commented May 3, 2021

rust-log-analyzer commented Jun 14, 2021

bors commented Jun 14, 2021

jyn514 commented Jun 14, 2021

bors commented Jun 15, 2021

CraftSpider commented Jun 15, 2021

bors commented Jun 15, 2021

rustdoc: revert deref recur to resume inclusion of impl ExtTrait<Local> for ExtType #84867

rustdoc: revert deref recur to resume inclusion of impl ExtTrait<Local> for ExtType #84867

Conversation

pnkfelix commented May 3, 2021 • edited

rust-highfive commented May 3, 2021

jyn514 left a comment

Choose a reason for hiding this comment

jyn514 May 3, 2021

Choose a reason for hiding this comment

jyn514 commented May 3, 2021

jyn514 commented May 3, 2021

bors commented May 3, 2021

jyn514 commented May 3, 2021

This comment has been minimized.

pnkfelix May 3, 2021

Choose a reason for hiding this comment

pnkfelix commented May 3, 2021

pnkfelix commented May 3, 2021

pnkfelix commented May 3, 2021

pnkfelix commented May 3, 2021

pnkfelix commented May 3, 2021

pnkfelix commented May 3, 2021

bors commented May 3, 2021

rust-log-analyzer commented Jun 14, 2021

bors commented Jun 14, 2021

jyn514 commented Jun 14, 2021

bors commented Jun 15, 2021

CraftSpider commented Jun 15, 2021

bors commented Jun 15, 2021

pnkfelix commented May 3, 2021 •

edited