rand: freebsd update, using getrandom.#101994
Merged
bors merged 1 commit intorust-lang:masterfrom Jul 26, 2023
Merged
Conversation
Contributor
|
r? @m-ou-se (rust-highfive has picked a reviewer for you, use r? to override) |
rustbot
added
the
T-libs
rust-highfive
added
the
S-waiting-on-review
Collaborator
|
Hey! It looks like you've submitted a new PR for the library teams! If this PR contains changes to any Examples of
|
Contributor
|
While I agree Rust supporting FreeBSD versions unsupported by upstream is stupid, I think it should be an explicit decision, not like this. Note that while FreeBSD 11 was EOL since 2021, Rust CI continued to use FreeBSD 11 until June 2022. |
Collaborator
|
☔ The latest upstream changes (presumably #102726) made this pull request unmergeable. Please resolve the merge conflicts. |
Contributor
Author
|
what would be your suggestion ? |
m-ou-se
added
I-needs-decision
Contributor
|
FCP on supported FreeBSD versions is now in progress at #89058. |
Member
Collaborator
|
📌 Commit b8ce3ce516b80ccbb5648f8a2ac104b46f295a8b has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
Collaborator
|
🔒 Merge conflict This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again. How do I rebase?Assuming
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial. Please avoid the "Resolve conflicts" button on GitHub. It uses Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message |
bors
added
S-waiting-on-author
devnexen
force-pushed
the
rand_fbsd_update
branch
from
b8ce3ce to
5fe8849
Compare
Contributor
Author
|
cc @Amanieu |
m-ou-se
reviewed
Mar 6, 2023
library/std/src/sys/unix/rand.rs
Outdated
Member
There was a problem hiding this comment.
GRND_INSECURE seems to be meaningless on FreeBSD. (It's non-existent on FreeBSD 12, and equivalent to GRND_NONBLOCK on FreeBSD 13+.) So re-using this same logic with GRND_INSECURE_AVAILABLE for Linux doesn't seem very useful.
devnexen
force-pushed
the
rand_fbsd_update
branch
from
5fe8849 to
2cb1130
Compare
Collaborator
|
These commits modify the If this was intentional then you can ignore this comment. |
supported since the 12th release, while 11.4 is EOL since 2021.
devnexen
force-pushed
the
rand_fbsd_update
branch
from
2cb1130 to
a7e0bab
Compare
Dylan-DPC
removed
the
S-waiting-on-author
Dylan-DPC
added
the
S-waiting-on-review
Member
|
Seems like m-ou-se's comments were addressed! |
Collaborator
bors
added
S-waiting-on-bors
workingjubilee
added a commit
to workingjubilee/rustc
that referenced
this pull request
Jul 26, 2023
…ngjubilee rand: freebsd update, using getrandom. supported since the 12th release, while 11.4 is EOL since 2021.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jul 26, 2023
…ngjubilee rand: freebsd update, using getrandom. supported since the 12th release, while 11.4 is EOL since 2021.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 26, 2023
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#101994 (rand: freebsd update, using getrandom.) - rust-lang#113930 (Add Param and Bound ty to SMIR) - rust-lang#113942 (Squelch a noisy rustc_expand unittest) - rust-lang#113996 (Define CMAKE_SYSTEM_NAME on a cross build targeting DragonFly.) - rust-lang#114070 (Add `sym::iter_mut` + `sym::as_mut_ptr` for Clippy) - rust-lang#114073 (Remove -Z diagnostic-width) - rust-lang#114090 (compiletest: remove ci-specific remap-path-prefix) r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
supported since the 12th release, while 11.4 is EOL since 2021.