Skip to content
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

Revert "Normalize <X as Y>::T for rustdoc" #79469

Merged
merged 1 commit into from
Nov 28, 2020
Merged

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Nov 27, 2020

Reverts #77467 by disabling normalization. See #79459; I intend to reland normalization once that's fixed.

r? @Aaron1011
cc @oli-obk @GuillaumeGomez

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 27, 2020
@jyn514 jyn514 added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Nov 27, 2020
@Aaron1011
Copy link
Member

@jyn514: It looks like the PR checks didn't run for some reason. Could you amend and force-push your commit to try to make them run?

@Aaron1011
Copy link
Member

I'm not very familiar with the original PR, but this looks good to me.

r? @oli-obk to make sure that I'm not missing anything.

@rust-highfive rust-highfive assigned oli-obk and unassigned Aaron1011 Nov 27, 2020
@jyn514
Copy link
Member Author

jyn514 commented Nov 27, 2020

I'm not at a computer right now, if someone could force push to my branch that would be great.

@Aaron1011
Copy link
Member

To avoid code churn, it might be a good idea to just add return true; to the beginning of the rustdoc normalize function. Once the necessary changes to trait normalization have been made, the rustdoc normalization logic could be re-enabled.

@jyn514
Copy link
Member Author

jyn514 commented Nov 27, 2020

Another regression #77467 introduced: Rustdoc no long respects type aliases.
Screenshot_20201127-095925_Ecosia

@oli-obk
Copy link
Contributor

oli-obk commented Nov 27, 2020

To avoid code churn, it might be a good idea to just add return true; to the beginning of the rustdoc normalize function.

I'm trying that locally right now. Will force push soonish.

@oli-obk oli-obk force-pushed the revert-77467-query-docs branch from 3224fdb to 817dbf2 Compare November 27, 2020 16:36
@oli-obk oli-obk force-pushed the revert-77467-query-docs branch from 817dbf2 to 8b81bb8 Compare November 27, 2020 17:09
@jyn514
Copy link
Member Author

jyn514 commented Nov 27, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Nov 27, 2020

📌 Commit 8b81bb8 has been approved by jyn514

@bors 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 Nov 27, 2020
@camelid
Copy link
Member

camelid commented Nov 27, 2020

Another regression #77467 introduced: Rustdoc no long respects type aliases.

Note: this is not a regression, and there's no type alias involved. RandomState is a struct, and explicitly declared on the impl, so rustdoc is correct here (and this change didn't affect it).

@jyn514
Copy link
Member Author

jyn514 commented Nov 27, 2020

@bors p=5

This fixes a P-critical regression.

@bors
Copy link
Contributor

bors commented Nov 28, 2020

⌛ Testing commit 8b81bb8 with merge 650d9d3...

@bors
Copy link
Contributor

bors commented Nov 28, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 28, 2020
@bors bors merged commit 650d9d3 into master Nov 28, 2020
@rustbot rustbot added this to the 1.50.0 milestone Nov 28, 2020
@camelid camelid deleted the revert-77467-query-docs branch November 28, 2020 03:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants