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

De-abuse TyKind::Error in pattern type checking #70932

Merged
merged 3 commits into from
Apr 10, 2020

Conversation

mark-i-m
Copy link
Member

@mark-i-m mark-i-m commented Apr 8, 2020

r? @eddyb

cc #70866

In particular, I would appreciate extra scrutiny over the soundness of these changes.

Also, this will go a bit slowly because I'm going to use my other PR (#70551) to check if I missed anything.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 8, 2020
@eddyb
Copy link
Member

eddyb commented Apr 8, 2020

r? @Centril who I remember suggesting something similar in the past

@rust-highfive rust-highfive assigned Centril and unassigned eddyb Apr 8, 2020
@Centril Centril 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 Apr 8, 2020
src/librustc_typeck/check/pat.rs Show resolved Hide resolved
src/librustc_typeck/check/pat.rs Show resolved Hide resolved
src/librustc_typeck/check/pat.rs Outdated Show resolved Hide resolved
src/librustc_typeck/check/pat.rs Outdated Show resolved Hide resolved
@rust-highfive

This comment has been minimized.

@mark-i-m
Copy link
Member Author

mark-i-m commented Apr 9, 2020

@Centril Ok, let's see if I got this right this time :)

I might still add some more commits if the CI in #70551 indicates more places to change in this file.

src/librustc_typeck/check/pat.rs Outdated Show resolved Hide resolved
src/librustc_typeck/check/pat.rs Outdated Show resolved Hide resolved
src/librustc_typeck/check/pat.rs Outdated Show resolved Hide resolved
@Centril
Copy link
Contributor

Centril commented Apr 9, 2020

@bors delegate+

@bors
Copy link
Contributor

bors commented Apr 9, 2020

✌️ @mark-i-m can now approve this pull request

@Centril
Copy link
Contributor

Centril commented Apr 9, 2020

r=me with the remaining comments addressed.

@mark-i-m
Copy link
Member Author

mark-i-m commented Apr 9, 2020

Thanks @Centril :) I updated the comments.

@bors r=Centril

@bors
Copy link
Contributor

bors commented Apr 9, 2020

📌 Commit f2e4709 has been approved by Centril

@bors
Copy link
Contributor

bors commented Apr 9, 2020

🌲 The tree is currently closed for pull requests below priority 10, this pull request will be tested once the tree is reopened

@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 Apr 9, 2020
@mark-i-m mark-i-m marked this pull request as ready for review April 9, 2020 14:35
@mark-i-m
Copy link
Member Author

mark-i-m commented Apr 9, 2020

Also marking this as not-a-draft... does anyone know what bors will do if you try merge a draft?

Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 9, 2020
De-abuse TyKind::Error in pattern type checking

r? @eddyb

cc rust-lang#70866

In particular, I would appreciate extra scrutiny over the soundness of these changes.

Also, this will go a bit slowly because I'm going to use my other PR (rust-lang#70551) to check if I missed anything.
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 10, 2020
Rollup of 8 pull requests

Successful merges:

 - rust-lang#70784 (Consider methods on fundamental `impl` when method is not found on numeric type)
 - rust-lang#70843 (Remove the Ord bound that was plaguing drain_filter)
 - rust-lang#70913 (Replace "rc"/"arc" lang items with Rc/Arc diagnostic items.)
 - rust-lang#70932 (De-abuse TyKind::Error in pattern type checking)
 - rust-lang#70952 (Clean up E0511 explanation)
 - rust-lang#70964 (rustc_session CLI lint parsing: mark a temporary hack as such)
 - rust-lang#70969 (Fix JSON file_name documentation for macros.)
 - rust-lang#70975 (Fix internal doc comment nits.)

Failed merges:

r? @ghost
@bors bors merged commit 5cd1599 into rust-lang:master Apr 10, 2020
@mark-i-m mark-i-m deleted the de-abuse-err-2 branch May 6, 2020 01:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants