Skip to content

Turn std_detect into a no_std crate #1005

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.

Sign up for GitHub

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 5 commits into from
Feb 14, 2021
Merged

Turn std_detect into a no_std crate #1005

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4abdad0
Rustfmt
Amanieu Feb 14, 2021
6af519d
Re-enable runtime feature detection on non-x86 platforms
Amanieu Feb 14, 2021
40c07b2
Replace uses of std with libc
Amanieu Feb 14, 2021
1b267f7
Stop parsing auxvec after AT_NULL
Amanieu Feb 14, 2021
20b51b8
Reimplement std_detect_env_override using libc instead of std
Amanieu Feb 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Reimplement std_detect_env_override using libc instead of std
  • Loading branch information
@Amanieu
Amanieu committed Feb 14, 2021
commit 20b51b8c898c0aba6e57d28247532d1800f5cb72
13 changes: 10 additions & 3 deletions crates/std_detect/src/detect/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,16 @@ cfg_if::cfg_if! {
if #[cfg(feature = "std_detect_env_override")] {
#[inline]
fn initialize(mut value: Initializer) -> Initializer {
if let Ok(disable) = crate::env::var("RUST_STD_DETECT_UNSTABLE") {
for v in disable.split(" ") {
let _ = super::Feature::from_str(v).map(|v| value.unset(v as u32));
let env = unsafe {
libc::getenv(b"RUST_STD_DETECT_UNSTABLE\0".as_ptr() as *const libc::c_char)
};
if !env.is_null() {
let len = unsafe { libc::strlen(env) };
let env = unsafe { core::slice::from_raw_parts(env as *const u8, len) };
if let Ok(disable) = core::str::from_utf8(env) {
for v in disable.split(" ") {
let _ = super::Feature::from_str(v).map(|v| value.unset(v as u32));
}
}
}
do_initialize(value);
Expand Down