Skip to content

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

Merged
bors merged 3 commits into
rust-lang:masterfrom
mark-i-m:de-abuse-err-2
Apr 10, 2020
Merged

De-abuse TyKind::Error in pattern type checking#70932
bors merged 3 commits into
rust-lang:masterfrom
mark-i-m:de-abuse-err-2

Conversation

@mark-i-m

@mark-i-mmark-i-m commented Apr 8, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

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-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 8, 2020
@mark-i-mmark-i-m mentioned this pull request Apr 8, 2020
Closed
8 tasks
@eddyb

eddyb commented Apr 8, 2020

Copy link
Copy Markdown
Contributor

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

@rust-highfiverust-highfive assigned Centril and unassigned eddybApr 8, 2020
Centril
Centril reviewed Apr 8, 2020
View reviewed changes
Comment threadsrc/librustc_typeck/check/pat.rs Outdated
@CentrilCentril 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
Centril
Centril reviewed Apr 8, 2020
View reviewed changes
Comment threadsrc/librustc_typeck/check/pat.rs Outdated
Comment threadsrc/librustc_typeck/check/pat.rs Outdated
Comment threadsrc/librustc_typeck/check/pat.rs Outdated
Comment threadsrc/librustc_typeck/check/pat.rs Outdated
@rust-highfive

This comment has been minimized.

Sign in to view
@mark-i-mmark-i-m mentioned this pull request Apr 9, 2020
Merged
@mark-i-m

mark-i-m commented Apr 9, 2020

Copy link
Copy Markdown
ContributorAuthor

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

Centril
Centril reviewed Apr 9, 2020
View reviewed changes
Comment threadsrc/librustc_typeck/check/pat.rs Outdated
Comment threadsrc/librustc_typeck/check/pat.rs Outdated
Comment threadsrc/librustc_typeck/check/pat.rs Outdated
@Centril

Centril commented Apr 9, 2020

Copy link
Copy Markdown
Contributor

@bors delegate+

@bors

bors commented Apr 9, 2020

Copy link
Copy Markdown
Collaborator

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

@Centril

Centril commented Apr 9, 2020

Copy link
Copy Markdown
Contributor

r=me with the remaining comments addressed.

@mark-i-m

mark-i-m commented Apr 9, 2020

Copy link
Copy Markdown
ContributorAuthor

Thanks @Centril :) I updated the comments.

@bors r=Centril

@bors

bors commented Apr 9, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit f2e4709 has been approved by Centril

@bors

bors commented Apr 9, 2020

Copy link
Copy Markdown
Collaborator

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

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

mark-i-m commented Apr 9, 2020

Copy link
Copy Markdown
ContributorAuthor

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
@Dylan-DPC
Rollup merge ofrust-lang#70932- mark-i-m:de-abuse-err-2, r=Centril
853d3bc
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.
@Dylan-DPC-zzDylan-DPC-zz mentioned this pull request Apr 9, 2020
Closed
@CentrilCentril mentioned this pull request Apr 10, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 10, 2020
@bors
Auto merge ofrust-lang#70983- Centril:rollup-npabk7c, r=Centril
dbc3cfd
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:masterApr 10, 2020
@mark-i-m
mark-i-m deleted the de-abuse-err-2 branch May 6, 2020 01:54
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@CentrilCentrilCentril left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@CentrilCentril

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mark-i-m@eddyb@rust-highfive@Centril@bors