Skip to content

Conversation

SimonSapin
Copy link
Contributor

Instead, use #[rustc_layout_scalar_valid_range_start(1)] directly on relevant libcore types.

@rust-highfive
Copy link
Contributor

r? @Kimundi

(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 Dec 26, 2018
@SimonSapin
Copy link
Contributor Author

r? @oli-obk, who replaced the non_zero lang item by this attribute in #54032.

@rust-highfive rust-highfive assigned oli-obk and unassigned Kimundi Dec 26, 2018
@Centril
Copy link
Contributor

Centril commented Dec 26, 2018

cc @RalfJung

@bors
Copy link
Collaborator

bors commented Dec 26, 2018

☔ The latest upstream changes (presumably #57108) made this pull request unmergeable. Please resolve the merge conflicts.

Instead, use `#[rustc_layout_scalar_valid_range_start(1)]` directly
on relevant libcore types.
@oli-obk
Copy link
Contributor

oli-obk commented Dec 27, 2018

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 27, 2018

📌 Commit 7a09115 has been approved by oli-obk

@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 Dec 27, 2018
@bors
Copy link
Collaborator

bors commented Dec 27, 2018

⌛ Testing commit 7a09115 with merge d174173...

bors added a commit that referenced this pull request Dec 27, 2018
Remove the private generic NonZero<T> wrapper type

Instead, use `#[rustc_layout_scalar_valid_range_start(1)]` directly on relevant libcore types.
@bors
Copy link
Collaborator

bors commented Dec 27, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing d174173 to master...

@bors bors merged commit 7a09115 into rust-lang:master Dec 27, 2018
@SimonSapin SimonSapin deleted the zero branch November 28, 2019 12:04
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.

6 participants