Skip to content

Commit fa21a6d

Browse files
authored
Disable Haiku in CI due to upstream breakage, and fix a no_std error. (#1042)
1 parent 6f72de5 commit fa21a6d

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/main.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,8 @@ jobs:
217217
# Omit --all-targets on gnu_ilp32 because dev-dependency tempfile depends on an older rustix
218218
- run: cargo check -Z build-std --target aarch64-unknown-linux-gnu_ilp32 --features=all-apis
219219
# Omit --all-targets on haiku because not all the tests build yet.
220-
- run: cargo check -Z build-std --target x86_64-unknown-haiku --features=all-apis
220+
# Temporarily disable this because the target appears to have breakage on nightly.
221+
#- run: cargo check -Z build-std --target x86_64-unknown-haiku --features=all-apis
221222
- run: cargo check -Z build-std --target x86_64-uwp-windows-msvc --all-targets --features=all-apis
222223
# Temporarily disable riscv32imc-esp-espidf due to std using SOMAXCONN.
223224
#- run: cargo check -Z build-std --target=riscv32imc-esp-espidf --features=all-apis

src/net/netdevice.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
//! [man-pages]: https://man7.org/linux/man-pages/man7/netdevice.7.html
1818
//! [Linux]: https://man7.org/linux/man-pages/man7/netdevice.7.html
1919
20-
#[cfg(feature = "alloc")]
21-
use crate::alloc::string::String;
2220
use crate::fd::AsFd;
2321
use crate::io;
22+
#[cfg(feature = "alloc")]
23+
use alloc::string::String;
2424

2525
/// `ioctl(fd, SIOCGIFINDEX, ifreq)`—Returns the interface index for a given
2626
/// name.

0 commit comments

Comments
 (0)