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

Fix some issues with unwrap_usize instead of assert_usize #61380

Merged
merged 6 commits into from
Jun 2, 2019

Conversation

varkor
Copy link
Member

@varkor varkor commented May 30, 2019

Fixes #61337.
Fixes #61341.
Fixes #61422.

r? @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 30, 2019
@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

src/librustc/ty/layout.rs Outdated Show resolved Hide resolved
@varkor
Copy link
Member Author

varkor commented Jun 2, 2019

I've removed the unnecessary guards in the rebase.

@eddyb
Copy link
Member

eddyb commented Jun 2, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jun 2, 2019

📌 Commit e82cd95 has been approved by eddyb

@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 Jun 2, 2019
Centril added a commit to Centril/rust that referenced this pull request Jun 2, 2019
…eddyb

Fix some issues with `unwrap_usize` instead of `assert_usize`

Fixes rust-lang#61337.
Fixes rust-lang#61341.
Fixes rust-lang#61422.

r? @eddyb
bors added a commit that referenced this pull request Jun 2, 2019
Rollup of 6 pull requests

Successful merges:

 - #61380 (Fix some issues with `unwrap_usize` instead of `assert_usize`)
 - #61423 (codegen: change `$6d$` to `$u6d$`)
 - #61438 (Point at individual type args on arg count mismatch)
 - #61441 (Tweak wording when encountering `fn` call in pattern)
 - #61451 (Fix missing semicolon in doc)
 - #61458 (Fix typo in AsRef doc)

Failed merges:

r? @ghost
@bors bors merged commit e82cd95 into rust-lang:master Jun 2, 2019
@varkor varkor added the F-const_generics `#![feature(const_generics)]` label Oct 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
F-const_generics `#![feature(const_generics)]` S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
5 participants