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

Fix abuses of tykind::err #70870

Merged
merged 3 commits into from
Apr 9, 2020
Merged

Fix abuses of tykind::err #70870

merged 3 commits into from
Apr 9, 2020

Conversation

mark-i-m
Copy link
Member

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

r? @eddyb

cc #70866

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 7, 2020
eddyb
eddyb reviewed Apr 7, 2020
View reviewed changes
src/librustc_privacy/lib.rs Outdated Show resolved Hide resolved
@eddyb
Copy link
Member

eddyb commented Apr 7, 2020

r? @nikomatsakis

@rust-highfive rust-highfive assigned nikomatsakis and unassigned eddyb Apr 7, 2020
@mark-i-m mark-i-m mentioned this pull request Apr 7, 2020
Closed
8 tasks
@mark-i-m

This comment has been minimized.

Sign in to view
@eddyb

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@mark-i-m

This comment has been minimized.

Sign in to view
@eddyb
Copy link
Member

eddyb commented Apr 7, 2020

Ugh so it doesn't work there either. Just use tcx.types.never I guess.

@mark-i-m
Copy link
Member Author

mark-i-m commented Apr 7, 2020 •
edited
Loading

@eddyb It seems to be past the ICE now, but src/test/ui/issues/issue-69841.rs is reaching unreachable code on line 28. I don't understand how these changes can cause that.

EDIT: CI is passing, so maybe this is just a stage 1/incremental bug?

@mark-i-m mark-i-m mentioned this pull request Apr 8, 2020
Merged
@eddyb
Copy link
Member

eddyb commented Apr 8, 2020

@bors r+ (cc @nikomatsakis)

@bors
Copy link
Contributor

bors commented Apr 8, 2020

📌 Commit daddf4d has been approved by eddyb

@bors
Copy link
Contributor

bors commented Apr 8, 2020

🌲 The tree is currently closed for pull requests below priority 1000, 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 8, 2020
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 8, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 9, 2020
@bors
Auto merge of rust-lang#70936 - Dylan-DPC:rollup-2ng3e5h, r=Dylan-DPC
d249d75 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#70134 (add basic support of OsStrExt for HermitCore)
 - rust-lang#70565 (Add inline attributes for functions used in the query system)
 - rust-lang#70828 (rustdoc: Don't try to load source files from external crates)
 - rust-lang#70870 (Fix abuses of tykind::err)
 - rust-lang#70906 (Suggest move for closures and async blocks in more cases.)
 - rust-lang#70912 (Do not suggest adding type param when `use` is already suggested)
 - rust-lang#70930 (add tracking issue to `VecDeque::make_contiguous`)

Failed merges:

r? @ghost
@bors bors merged commit d0c8839 into rust-lang:master Apr 9, 2020
@mark-i-m mark-i-m deleted the de-abuse-err branch May 6, 2020 01:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eddyb eddyb eddyb approved these changes

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: 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 @bors @nikomatsakis