summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-11-27 20:35:18 +0000
committerbors <bors@rust-lang.org>2018-11-27 20:35:18 +0000
commit8bd330a70f3ed2c8fbf93e2d3d31edefcbc9183d (patch)
treea9b49c2f1122bf0e4ffa8670cba949ab2a8012c9
parent4113bf258d2e4f2e722c647d620f2ad62ce4689f (diff)
parent9acd5ea4ccab8cb247ec81f943bd7c3f961045bd (diff)
downloadrust-libc-8bd330a70f3ed2c8fbf93e2d3d31edefcbc9183d.tar.gz
Auto merge of #1153 - gnzlbg:fuchsia2, r=alexcrichton
Remove unreachable fuchsia branches cc @cramertj So this should be a non-functional change because these branches are unreachable, but please try to build fuchsia with this change to make sure this doesn't break anything.
-rw-r--r--src/unix/mod.rs7
-rw-r--r--src/unix/notbsd/linux/mod.rs2
-rw-r--r--src/unix/notbsd/mod.rs5
3 files changed, 4 insertions, 10 deletions
diff --git a/src/unix/mod.rs b/src/unix/mod.rs
index ff9e1954bb..1358976a53 100644
--- a/src/unix/mod.rs
+++ b/src/unix/mod.rs
@@ -347,10 +347,6 @@ cfg_if! {
#[link(name = "root")]
#[link(name = "network")]
extern {}
- } else if #[cfg(target_os = "fuchsia")] {
- #[link(name = "c")]
- #[link(name = "fdio")]
- extern {}
} else if #[cfg(target_env = "newlib")] {
#[link(name = "c")]
#[link(name = "m")]
@@ -1126,8 +1122,7 @@ cfg_if! {
pub use self::newlib::*;
} else if #[cfg(any(target_os = "linux",
target_os = "android",
- target_os = "emscripten",
- target_os = "fuchsia"))] {
+ target_os = "emscripten"))] {
mod notbsd;
pub use self::notbsd::*;
} else if #[cfg(any(target_os = "macos",
diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs
index 4893004c7f..58037fa578 100644
--- a/src/unix/notbsd/linux/mod.rs
+++ b/src/unix/notbsd/linux/mod.rs
@@ -2257,7 +2257,7 @@ extern {
}
cfg_if! {
- if #[cfg(any(target_env = "musl", target_os = "fuchsia"))] {
+ if #[cfg(target_env = "musl")] {
mod musl;
pub use self::musl::*;
} else if #[cfg(any(target_arch = "mips",
diff --git a/src/unix/notbsd/mod.rs b/src/unix/notbsd/mod.rs
index 6e4500684e..f66350a191 100644
--- a/src/unix/notbsd/mod.rs
+++ b/src/unix/notbsd/mod.rs
@@ -53,8 +53,7 @@ s! {
pub ai_addrlen: socklen_t,
#[cfg(any(target_os = "linux",
- target_os = "emscripten",
- target_os = "fuchsia"))]
+ target_os = "emscripten"))]
pub ai_addr: *mut ::sockaddr,
pub ai_canonname: *mut c_char,
@@ -1235,7 +1234,7 @@ cfg_if! {
if #[cfg(target_os = "emscripten")] {
mod emscripten;
pub use self::emscripten::*;
- } else if #[cfg(any(target_os = "linux", target_os = "fuchsia"))] {
+ } else if #[cfg(target_os = "linux")] {
mod linux;
pub use self::linux::*;
} else if #[cfg(target_os = "android")] {