From 9f76f5dcc60f7d10f1d2bbdc1b279f8272db69d0 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sun, 21 Apr 2019 20:27:00 -0600
Subject: [PATCH] Remove special casing for Redox, as it is now supported by
Unix target family
---
Cargo.toml | 2 +-
src/rand.rs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index bdb455031..4205858e2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -282,7 +282,7 @@ untrusted = "0.6.2"
[target.'cfg(target_os = "linux")'.dependencies]
libc = { version = "0.2.34" }
-[target.'cfg(any(target_os = "redox", all(unix, not(any(target_os = "macos", target_os = "ios")))))'.dependencies]
+[target.'cfg(all(unix, not(any(target_os = "macos", target_os = "ios"))))'.dependencies]
lazy_static = "1.2"
# Keep this in sync with `[dependencies]` in pregenerate_asm/Cargo.toml.
diff --git a/src/rand.rs b/src/rand.rs
index d5434f655..265244b69 100644
--- a/src/rand.rs
+++ b/src/rand.rs
@@ -193,7 +193,7 @@ mod urandom {
pub fn fill(dest: &mut [u8]) -> Result<(), error::Unspecified> {
#[cfg(target_os = "redox")]
static RANDOM_PATH: &str = "rand:";
- #[cfg(unix)]
+ #[cfg(all(unix, not(target_os = "redox")))]
static RANDOM_PATH: &str = "/dev/urandom";
lazy_static! {
--
GitLab