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.

Sign up for GitHub

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

Jump to bottom

Clean up errors in typeck and resolve #74005

Merged
merged 4 commits into from Aug 11, 2020
Merged

Clean up errors in typeck and resolve #74005

merged 4 commits into from Aug 11, 2020

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Jul 3, 2020 •
edited

  • Tweak ordering of suggestions
  • Do not suggest similarly named enclosing item
  • Point at item definition in foreign crates
  • Add missing primary label

CC #34255.

@rust-highfive
Copy link
Collaborator

r? @ecstatic-morse

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 3, 2020
@ecstatic-morse
Copy link
Contributor

I'm not familiar with this part of the code base.

r? @petrochenkov maybe?

petrochenkov
petrochenkov reviewed Jul 8, 2020
View reviewed changes
src/librustc_session/parse.rs Outdated Show resolved Hide resolved
src/librustc_session/parse.rs Outdated Show resolved Hide resolved
src/librustc_parse/parser/mod.rs Outdated Show resolved Hide resolved
src/librustc_resolve/late.rs Outdated Show resolved Hide resolved
src/librustc_resolve/late.rs Outdated Show resolved Hide resolved
src/librustc_resolve/late/diagnostics.rs Outdated Show resolved Hide resolved
@petrochenkov
Copy link
Contributor

@estebank
Could you break orthogonal changes from this PR into separate PRs?
I can't handle this amount of diagnostic improvements in one go, perhaps splitting into multiple portions will relieve the pain.

@petrochenkov petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 8, 2020
@estebank estebank mentioned this pull request Jul 9, 2020
Merged
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 13, 2020
@Manishearth
Rollup merge of rust-lang#74173 - estebank:struct-pat-as-enum, r=petr…
2b6cecd 
…ochenkov

Detect tuple struct incorrectly used as struct pat

Subpart of rust-lang#74005.

r? @petrochenkov
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 13, 2020
@Manishearth
Rollup merge of rust-lang#74173 - estebank:struct-pat-as-enum, r=petr…
548519c 
…ochenkov

Detect tuple struct incorrectly used as struct pat

Subpart of rust-lang#74005.

r? @petrochenkov
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 13, 2020
@Manishearth
Rollup merge of rust-lang#74173 - estebank:struct-pat-as-enum, r=petr…
1355232 
…ochenkov

Detect tuple struct incorrectly used as struct pat

Subpart of rust-lang#74005.

r? @petrochenkov
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 13, 2020
@Manishearth
Rollup merge of rust-lang#74173 - estebank:struct-pat-as-enum, r=petr…
7913222 
…ochenkov

Detect tuple struct incorrectly used as struct pat

Subpart of rust-lang#74005.

r? @petrochenkov
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 14, 2020
@Manishearth
Rollup merge of rust-lang#74173 - estebank:struct-pat-as-enum, r=petr…
25ce559 
…ochenkov

Detect tuple struct incorrectly used as struct pat

Subpart of rust-lang#74005.

r? @petrochenkov
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 14, 2020
@Manishearth
Rollup merge of rust-lang#74173 - estebank:struct-pat-as-enum, r=petr…
3eb4256 
…ochenkov

Detect tuple struct incorrectly used as struct pat

Subpart of rust-lang#74005.

r? @petrochenkov
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jul 14, 2020
@Dylan-DPC
Rollup merge of rust-lang#74173 - estebank:struct-pat-as-enum, r=petr…
88f072b 
…ochenkov

Detect tuple struct incorrectly used as struct pat

Subpart of rust-lang#74005.

r? @petrochenkov
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 14, 2020
@Manishearth
Rollup merge of rust-lang#74173 - estebank:struct-pat-as-enum, r=petr…
b9a0f58 
…ochenkov

Detect tuple struct incorrectly used as struct pat

Subpart of rust-lang#74005.

r? @petrochenkov
@bors

This comment has been minimized.

Sign in to view
@petrochenkov
Copy link
Contributor

Blocked on #74210.

@petrochenkov petrochenkov added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 26, 2020
@petrochenkov
Copy link
Contributor

The pre-requisite PRs have landed.

@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Aug 4, 2020
@estebank
Copy link
Contributor Author

estebank commented Aug 6, 2020

@petrochenkov I cleaned up the PR a little bit against current master. I'll update the description later as a lot of the original PR has landed in others.

@estebank estebank force-pushed the type-ascription-redux branch 2 times, most recently from fc08a8a to 1df662c Compare August 6, 2020 19:49
@estebank estebank force-pushed the type-ascription-redux branch 2 times, most recently from 5139684 to b90ee09 Compare August 7, 2020 19:41
@estebank
Copy link
Contributor Author

estebank commented Aug 7, 2020

Split off a bunch of unrelated changes to #75267.

@petrochenkov
Copy link
Contributor

This still looks like a collection of unrelated changes and it's hard to see which tests are affected by which changes.
Could you factor out more small self-contained PRs out of this?

@petrochenkov petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 9, 2020
@estebank estebank mentioned this pull request Aug 10, 2020
Merged
@estebank
Copy link
Contributor Author

@petrochenkov I split a few things that were fully removable from the PR into others, and split the rest of the code into independent commits that show the effects of specific changes on the output. Splitting these into separate PRs becomes hard because in many cases they affect the stderr output of the same files, which will cause a much more painful process to land them.

@petrochenkov
Copy link
Contributor

@estebank
Could you at least drop anything involving current_expr?
I still think it's incorrect and shouldn't be necessary.

@estebank
Copy link
Contributor Author

@petrochenkov Will do, but I am at a loss of an alternate way to accomplish this change.

@estebank
Copy link
Contributor Author

@petrochenkov done.

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Aug 10, 2020

📌 Commit 54f1b43 has been approved by petrochenkov

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 10, 2020
@bors
Copy link
Contributor

bors commented Aug 10, 2020

⌛ Testing commit 54f1b43 with merge 3bb5a86...

@bors
Copy link
Contributor

bors commented Aug 11, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: petrochenkov
Pushing 3bb5a86 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 11, 2020
@bors bors merged commit 3bb5a86 into rust-lang:master Aug 11, 2020
This was referenced Aug 11, 2020
Merged
Merged
@estebank estebank deleted the type-ascription-redux branch November 9, 2023 05:16
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

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.
Projects
None yet
Milestone
1.47.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@estebank @rust-highfive @ecstatic-morse @petrochenkov @bors @cuviper