-
Notifications
You must be signed in to change notification settings - Fork 214
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
Conversation
…-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).
I think with this PR you are trying to merge |
src/lib.rs
Outdated
target_os = "hermit", | ||
target_os = "l4re" | ||
)) | ||
))] |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
Ya I selected the wrong base, this is supposed to just update |
@newpavlov this should probably wait on #117 to merge first. |
This is now done, this now merges the current |
Not too bad on merge conflicts, only one was in
src/lib.rs
. Fixed by using the fact thatvxworks
is in theunix
family.