Skip to content

Commit 8bd330a

Browse files
committed
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.
2 parents 4113bf2 + 9acd5ea commit 8bd330a

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

src/unix/mod.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,6 @@ cfg_if! {
347347
#[link(name = "root")]
348348
#[link(name = "network")]
349349
extern {}
350-
} else if #[cfg(target_os = "fuchsia")] {
351-
#[link(name = "c")]
352-
#[link(name = "fdio")]
353-
extern {}
354350
} else if #[cfg(target_env = "newlib")] {
355351
#[link(name = "c")]
356352
#[link(name = "m")]
@@ -1126,8 +1122,7 @@ cfg_if! {
11261122
pub use self::newlib::*;
11271123
} else if #[cfg(any(target_os = "linux",
11281124
target_os = "android",
1129-
target_os = "emscripten",
1130-
target_os = "fuchsia"))] {
1125+
target_os = "emscripten"))] {
11311126
mod notbsd;
11321127
pub use self::notbsd::*;
11331128
} else if #[cfg(any(target_os = "macos",

src/unix/notbsd/linux/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2257,7 +2257,7 @@ extern {
22572257
}
22582258

22592259
cfg_if! {
2260-
if #[cfg(any(target_env = "musl", target_os = "fuchsia"))] {
2260+
if #[cfg(target_env = "musl")] {
22612261
mod musl;
22622262
pub use self::musl::*;
22632263
} else if #[cfg(any(target_arch = "mips",

src/unix/notbsd/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ s! {
5353
pub ai_addrlen: socklen_t,
5454

5555
#[cfg(any(target_os = "linux",
56-
target_os = "emscripten",
57-
target_os = "fuchsia"))]
56+
target_os = "emscripten"))]
5857
pub ai_addr: *mut ::sockaddr,
5958

6059
pub ai_canonname: *mut c_char,
@@ -1235,7 +1234,7 @@ cfg_if! {
12351234
if #[cfg(target_os = "emscripten")] {
12361235
mod emscripten;
12371236
pub use self::emscripten::*;
1238-
} else if #[cfg(any(target_os = "linux", target_os = "fuchsia"))] {
1237+
} else if #[cfg(target_os = "linux")] {
12391238
mod linux;
12401239
pub use self::linux::*;
12411240
} else if #[cfg(target_os = "android")] {

0 commit comments

Comments
 (0)