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

rename Scalar::{ptr_null -> null_ptr} and add "machine_" prefix like elsewhere #70503

Merged
merged 2 commits into from
Mar 29, 2020

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Mar 28, 2020

"NULL pointer" is just much more common terminology than "pointer-null".
Also I forgot two methods when renaming all the Scalar things to (to|from)_machine_(u|i)size.

@rust-highfive
Copy link
Collaborator

r? @varkor

(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 Mar 28, 2020
@RalfJung RalfJung changed the title rename Scalar::{ptr_null -> null_ptr} rename Scalar::{ptr_null -> null_ptr} and add "machine_" prefix like elsewhere Mar 28, 2020
@varkor
Copy link
Member

varkor commented Mar 28, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 28, 2020

📌 Commit 01dbaed has been approved by varkor

@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 Mar 28, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 29, 2020
Rollup of 5 pull requests

Successful merges:

 - rust-lang#69937 (ASCII methods on OsStr)
 - rust-lang#70235 (Validate git setup before accessing functionality)
 - rust-lang#70503 (rename Scalar::{ptr_null -> null_ptr} and add "machine_" prefix like elsewhere)
 - rust-lang#70508 (Miri: use more specialized Scalar::from_ constructors where appropriate)
 - rust-lang#70510 (fix TryEnterCriticalSection return type)

Failed merges:

r? @ghost
@bors bors merged commit 96e2934 into rust-lang:master Mar 29, 2020
@RalfJung RalfJung deleted the null branch March 29, 2020 09:22
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.

4 participants