From 693649fa3dedf27e0ff47c6ec3fa8cc51ef4648a Mon Sep 17 00:00:00 2001 From: arctic-alpaca <67190338+arctic-alpaca@users.noreply.github.com> Date: Sun, 10 Dec 2023 15:35:24 +0100 Subject: [PATCH] More fixes --- src/backend/libc/net/netdevice.rs | 3 ++- src/backend/linux_raw/net/netdevice.rs | 4 ++-- src/net/netdevice.rs | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/backend/libc/net/netdevice.rs b/src/backend/libc/net/netdevice.rs index d1f22e000..18e9fbe75 100644 --- a/src/backend/libc/net/netdevice.rs +++ b/src/backend/libc/net/netdevice.rs @@ -1,9 +1,10 @@ #![allow(unsafe_code)] +use crate::alloc::string::String; +use crate::alloc::string::ToString; use crate::backend::io::syscalls::ioctl; use crate::fd::AsFd; use crate::ffi::CStr; -#[cfg(all(target_os = "linux", feature = "alloc"))] use crate::ffi::CString; use crate::io; use crate::net::netdevice::open_socket; diff --git a/src/backend/linux_raw/net/netdevice.rs b/src/backend/linux_raw/net/netdevice.rs index 7a20a2342..ccfc07270 100644 --- a/src/backend/linux_raw/net/netdevice.rs +++ b/src/backend/linux_raw/net/netdevice.rs @@ -1,13 +1,13 @@ #![allow(unsafe_code)] +use crate::alloc::string::String; +use crate::alloc::string::ToString; use crate::backend::io::syscalls::ioctl; use crate::fd::AsFd; use crate::ffi::CStr; -#[cfg(all(target_os = "linux", feature = "alloc"))] use crate::ffi::CString; use crate::io; use crate::net::netdevice::open_socket; -use crate::path::Arg; use core::mem::MaybeUninit; use core::ptr::{addr_of, addr_of_mut}; use linux_raw_sys::ctypes::c_char; diff --git a/src/net/netdevice.rs b/src/net/netdevice.rs index 626533f12..7a64b77c0 100644 --- a/src/net/netdevice.rs +++ b/src/net/netdevice.rs @@ -5,6 +5,7 @@ //! //! [Linux]: https://man7.org/linux/man-pages/man7/netdevice.7.html +use crate::alloc::string::String; use crate::fd::OwnedFd; use crate::io; use crate::io::Errno;