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 10 pull requests #90934

Merged
merged 22 commits into from
Nov 16, 2021
Merged

Rollup of 10 pull requests #90934

merged 22 commits into from
Nov 16, 2021

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ibraheemdev and others added 22 commits September 2, 2021 16:03
Renames File::with_options to File::options, per consensus in
rust-lang#65439, and stabilizes it.
Rename WASI's `FileTypeExt::is_character_device` to
`FileTypeExt::is_char_device`, for consistency with the Unix
`FileTypeExt::is_char_device`.

Also, add a `FileTypeExt::is_socket` function, for consistency with the
Unix `FileTypeExt::is_socket` function.
These are working well for *unsigned* types, for the the signed ones there are a bunch of questions about what the semantics and API should be.  And for the main "helpers for big integer implementations" use, there's no need for the signed versions anyway.

And there are plenty of other methods which exist for unsigned types but not signed ones, like `next_power_of_two`, so this isn't unusual.

Fixes 90541
Tweak the `options!` macro to allow for -Z and -C options with the same
name without generating conflicting internal parsing functions.

Split out of the commit stabilizing -Z strip as -C strip.
Leave -Z strip available temporarily as an alias, to avoid breaking
cargo until cargo transitions to using -C strip. (If the user passes
both, the -C version wins.)
Stabilize File::options()

Renames File::with_options to File::options, per consensus in
rust-lang#65439, and stabilizes it.
…llible, r=yaahc

Implement `Termination` for `Result<Infallible, E>`

As noted in rust-lang#43301, `Result<!, E>` is not usable on stable.
…leywiser

Stabilize -Z strip as -C strip

Leave -Z strip available temporarily as an alias, to avoid breaking
cargo until cargo transitions to using -C strip.
…-Simulacrum

Fix standard library test with read_link

closes rust-lang#90669
resolve this issue by comparing between Paths instead of strs
Android is not GNU

For a long time, the Android targets had `target_env=""`, but this changed to `"gnu"` in Rust 1.49.0. I tracked this down to rust-lang#77729 which started setting `"gnu"` in the `linux_base` target options, and this was inherited by `android_base`. Then rust-lang#78929 split the env into `linux_gnu_base`, but `android_base` was also changed to follow that. Android was not specifically mentioned in either pull request, so I believe this was an accident. Moving it back to `linux_base` will use an empty `env` again.

r? ````@Mark-Simulacrum````
cc ````@petrochenkov````
…evice, r=alexcrichton

Rename WASI's `is_character_device` to `is_char_device`.

Rename WASI's `FileTypeExt::is_character_device` to
`FileTypeExt::is_char_device`, for consistency with the Unix
`FileTypeExt::is_char_device`.

Also, add a `FileTypeExt::is_socket` function, for consistency with the
Unix `FileTypeExt::is_socket` function.

r? `@alexcrichton`
Move some tests to more reasonable directories - 9

cc rust-lang#73494
r? `@petrochenkov`
…rs, r=joshtriplett

Remove bigint_helper_methods for *signed* types

This PR inspired by `@cuviper's` comment @ rust-lang#90541 (comment)

These are working well for *unsigned* types, so keep those, but for the the *signed* ones there are a bunch of questions about what the semantics and API should be.  For the main "helpers for big integer implementations" use, there's no need for the signed versions anyway.  There are plenty of other methods which exist for unsigned types but not signed ones, like `next_power_of_two`, so this isn't unusual.

Fixes rust-lang#90541
Tracking issue rust-lang#85532
…li-obk

fix ICE on Miri/CTFE copy of half a pointer

Fixes rust-lang/miri#1910
r? `````@oli-obk`````
…orkingjubilee

disable portable SIMD tests in Miri

Until rust-lang/miri#1912 is resolved, we'll have to skip these tests in Miri.
@rustbot rustbot added the rollup A PR which is a rollup label Nov 16, 2021
@JohnTitor
Copy link
Member Author

@bors r+ rollup=never p=10

@bors
Copy link
Contributor

bors commented Nov 16, 2021

📌 Commit 35dd1f6 has been approved by JohnTitor

@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 Nov 16, 2021
@bors
Copy link
Contributor

bors commented Nov 16, 2021

⌛ Testing commit 35dd1f6 with merge 0206312...

@bors
Copy link
Contributor

bors commented Nov 16, 2021

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 0206312 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 16, 2021
@bors bors merged commit 0206312 into rust-lang:master Nov 16, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (0206312): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

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. rollup A PR which is a rollup 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.