Skip to content

Merge branch 'master' into '0.2' #116

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

Merged
merged 4 commits into from
Oct 24, 2019
Merged

Merge branch 'master' into '0.2' #116

merged 4 commits into from
Oct 24, 2019

Conversation

josephlr
Copy link
Member

Not too bad on merge conflicts, only one was in src/lib.rs. Fixed by using the fact that vxworks is in the unix family.

alarixnia and others added 2 commits October 23, 2019 09:03
…-random#115)

Rename it from freebsd.rs to sysctl_arandom.rs.

NetBSD has been patching rustc for some time to use the FreeBSD
implementation because every single invocation of the compiler
may drain from the entropy pool and cause the next to block.

This can massively inflate build times for rust software, or cause
it to fail entirely, especially in VMs (for example, our Xen package
building cluster).
@josephlr josephlr requested a review from dhardy October 24, 2019 07:48
@newpavlov
Copy link
Member

newpavlov commented Oct 24, 2019

I think with this PR you are trying to merge 0.2 into master, not the other way around. We probably should release v0.1.13 with the VxWorks and NetBSD changes first. And after that it could be reasonable to merge 0.2 into master.

src/lib.rs Outdated
target_os = "hermit",
target_os = "l4re"
))
))]
Copy link
Member

@newpavlov newpavlov Oct 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW personally I would prefer to use an explicit enumeration of targets. Size-wise it will not be that bad:

#[cfg(any(
    target_os = "android", target_os = "dragonfly", target_os = "emscripten",
    target_os = "freebsd", target_os = "haiku",     target_os = "illumos",
    target_os = "linux",   target_os = "macos",     target_os = "netbsd",
    target_os = "openbsd", target_os = "redox",     target_os = "solaris",
    target_os = "vxworks",
))]
#[allow(dead_code)]
mod util_libc;

But it's just my preference, so feel free to ignore.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, but think this should be fixed in a separate 0.2 PR, I'll open one when this gets merged.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's the basic idea: josephlr@e47483b

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like it! Code looks much nicer.

@josephlr josephlr changed the base branch from master to 0.2 October 24, 2019 08:09
@josephlr
Copy link
Member Author

I think with this PR you are trying to merge 0.2 into master, not the other way around. We probably should release v0.1.13 with the VxWorks and NetBSD changes first. And after that it could be reasonable to merge 0.2 into master.

Ya I selected the wrong base, this is supposed to just update 0.2 to incorporate the latest changes from master. We should wait a bit before merging 0.2 into master.

@josephlr
Copy link
Member Author

@newpavlov this should probably wait on #117 to merge first.

@josephlr
Copy link
Member Author

@newpavlov this should probably wait on #117 to merge first.

This is now done, this now merges the current master (including #117) into 0.2.

@josephlr josephlr merged commit 1f1f964 into rust-random:0.2 Oct 24, 2019
@josephlr josephlr mentioned this pull request Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants