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

Rollup of 5 pull requests #70518

Merged
merged 17 commits into from
Mar 29, 2020
Merged

Rollup of 5 pull requests #70518

merged 17 commits into from
Mar 29, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

dillona and others added 17 commits March 21, 2020 13:17
ASCII methods on OsStr

Would close rust-lang#69566

I don't know enough about encodings to know if this is a valid change, however the comment on the issue suggests it could be.

This does two things:

1. Makes ASCII methods available on OsStr

2. Makes it possible to obtain a `&mut OsStr`. This is necessary to actually use `OsStr::make_ascii_*case` methods since they modify the underlying value. As far as I can tell, the only way to modify a `&mut OsStr` is via the methods I just added.

My original hope was to have these methods on `OsStrExt` for Windows, since the standard library already assumes `make_ascii_uppercase` is valid in Windows (see the change I made to windows/process.rs). If it is found these are not valid changes on non-Windows platforms, I can move the methods to the ext trait instead.
…t, r=Mark-Simulacrum

Validate git setup before accessing functionality

Closes rust-lang#70182
rename Scalar::{ptr_null -> null_ptr} and add "machine_" prefix like elsewhere

"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`.
Miri: use more specialized Scalar::from_ constructors where appropriate
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Mar 29, 2020

📌 Commit be8d896 has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 29, 2020
@bors
Copy link
Contributor

bors commented Mar 29, 2020

⌛ Testing commit be8d896 with merge 150322f...

@bors
Copy link
Contributor

bors commented Mar 29, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 150322f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 29, 2020
@bors bors merged commit 150322f into rust-lang:master Mar 29, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #70518!

Tested on commit 150322f.
Direct link to PR: #70518

💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Mar 29, 2020
Tested on commit rust-lang/rust@150322f.
Direct link to PR: <rust-lang/rust#70518>

💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
@Dylan-DPC-zz Dylan-DPC-zz deleted the rollup-n2gkh3a branch March 29, 2020 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

7 participants