Skip to content

Commit 932d6d2

Browse files
SusurrusSusurrus
committed
Remove unnecessary path aliasing
1 parent 50923ba commit 932d6d2

File tree

1 file changed

+28
-31
lines changed

1 file changed

+28
-31
lines changed

‎src/sys/ioctl/mod.rs

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,6 @@ mod platform;
114114

115115
pub use self::platform::*;
116116

117-
/// A hack to get the macros to work nicely.
118-
#[doc(hidden)]
119-
pub use ::libc as libc;
120-
121117
/// Convert raw ioctl return value to a Nix result
122118
#[macro_export]
123119
#[doc(hidden)]
@@ -129,69 +125,70 @@ macro_rules! convert_ioctl_res {
129125
);
130126
}
131127

128+
/// Generates ioctl functions. See [::sys::ioctl](sys/ioctl/index.html).
132129
#[macro_export]
133130
macro_rules! ioctl {
134131
(bad $name:ident with $nr:expr) => (
135-
pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
132+
pub unsafe fn $name(fd: $crate::libc::c_int,
136133
data: *mut u8)
137-
-> $crate::Result<$crate::sys::ioctl::libc::c_int> {
138-
convert_ioctl_res!($crate::sys::ioctl::libc::ioctl(fd, $nr as $crate::sys::ioctl::libc::c_ulong, data))
134+
-> $crate::Result<$crate::libc::c_int> {
135+
convert_ioctl_res!($crate::libc::ioctl(fd, $nr as $crate::libc::c_ulong, data))
139136
}
140137
);
141138
(bad none $name:ident with $nr:expr) => (
142-
pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int)
143-
-> $crate::Result<$crate::sys::ioctl::libc::c_int> {
144-
convert_ioctl_res!(libc::ioctl(fd, $nr as $crate::sys::ioctl::libc::c_ulong))
139+
pub unsafe fn $name(fd: $crate::libc::c_int)
140+
-> $crate::Result<$crate::libc::c_int> {
141+
convert_ioctl_res!($crate::libc::ioctl(fd, $nr as $crate::libc::c_ulong))
145142
}
146143
);
147144
(none $name:ident with $ioty:expr, $nr:expr) => (
148-
pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int)
149-
-> $crate::Result<$crate::sys::ioctl::libc::c_int> {
150-
convert_ioctl_res!($crate::sys::ioctl::libc::ioctl(fd, io!($ioty, $nr) as $crate::sys::ioctl::libc::c_ulong))
145+
pub unsafe fn $name(fd: $crate::libc::c_int)
146+
-> $crate::Result<$crate::libc::c_int> {
147+
convert_ioctl_res!($crate::libc::ioctl(fd, io!($ioty, $nr) as $crate::libc::c_ulong))
151148
}
152149
);
153150
(read $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
154-
pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
151+
pub unsafe fn $name(fd: $crate::libc::c_int,
155152
val: *mut $ty)
156-
-> $crate::Result<$crate::sys::ioctl::libc::c_int> {
157-
convert_ioctl_res!($crate::sys::ioctl::libc::ioctl(fd, ior!($ioty, $nr, ::std::mem::size_of::<$ty>()) as $crate::sys::ioctl::libc::c_ulong, val))
153+
-> $crate::Result<$crate::libc::c_int> {
154+
convert_ioctl_res!($crate::libc::ioctl(fd, ior!($ioty, $nr, ::std::mem::size_of::<$ty>()) as $crate::libc::c_ulong, val))
158155
}
159156
);
160157
(write $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
161-
pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
158+
pub unsafe fn $name(fd: $crate::libc::c_int,
162159
val: $ty)
163-
-> $crate::Result<$crate::sys::ioctl::libc::c_int> {
164-
convert_ioctl_res!($crate::sys::ioctl::libc::ioctl(fd, iow!($ioty, $nr, ::std::mem::size_of::<$ty>()) as $crate::sys::ioctl::libc::c_ulong, val))
160+
-> $crate::Result<$crate::libc::c_int> {
161+
convert_ioctl_res!($crate::libc::ioctl(fd, iow!($ioty, $nr, ::std::mem::size_of::<$ty>()) as $crate::libc::c_ulong, val))
165162
}
166163
);
167164
(readwrite $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
168-
pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
165+
pub unsafe fn $name(fd: $crate::libc::c_int,
169166
val: *mut $ty)
170-
-> $crate::Result<$crate::sys::ioctl::libc::c_int> {
171-
convert_ioctl_res!($crate::sys::ioctl::libc::ioctl(fd, iorw!($ioty, $nr, ::std::mem::size_of::<$ty>()) as $crate::sys::ioctl::libc::c_ulong, val))
167+
-> $crate::Result<$crate::libc::c_int> {
168+
convert_ioctl_res!($crate::libc::ioctl(fd, iorw!($ioty, $nr, ::std::mem::size_of::<$ty>()) as $crate::libc::c_ulong, val))
172169
}
173170
);
174171
(read buf $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
175-
pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
172+
pub unsafe fn $name(fd: $crate::libc::c_int,
176173
val: *mut $ty,
177174
len: usize)
178-
-> $crate::Result<$crate::sys::ioctl::libc::c_int> {
179-
convert_ioctl_res!($crate::sys::ioctl::libc::ioctl(fd, ior!($ioty, $nr, len) as $crate::sys::ioctl::libc::c_ulong, val))
175+
-> $crate::Result<$crate::libc::c_int> {
176+
convert_ioctl_res!($crate::libc::ioctl(fd, ior!($ioty, $nr, len) as $crate::libc::c_ulong, val))
180177
}
181178
);
182179
(write buf $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
183-
pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
180+
pub unsafe fn $name(fd: $crate::libc::c_int,
184181
val: *const $ty,
185-
len: usize) -> $crate::Result<$crate::sys::ioctl::libc::c_int> {
186-
convert_ioctl_res!($crate::sys::ioctl::libc::ioctl(fd, iow!($ioty, $nr, len) as $crate::sys::ioctl::libc::c_ulong, val))
182+
len: usize) -> $crate::Result<$crate::libc::c_int> {
183+
convert_ioctl_res!($crate::libc::ioctl(fd, iow!($ioty, $nr, len) as $crate::libc::c_ulong, val))
187184
}
188185
);
189186
(readwrite buf $name:ident with $ioty:expr, $nr:expr; $ty:ty) => (
190-
pub unsafe fn $name(fd: $crate::sys::ioctl::libc::c_int,
187+
pub unsafe fn $name(fd: $crate::libc::c_int,
191188
val: *mut $ty,
192189
len: usize)
193-
-> $crate::Result<$crate::sys::ioctl::libc::c_int> {
194-
convert_ioctl_res!($crate::sys::ioctl::libc::ioctl(fd, iorw!($ioty, $nr, len) as $crate::sys::ioctl::libc::c_ulong, val))
190+
-> $crate::Result<$crate::libc::c_int> {
191+
convert_ioctl_res!($crate::libc::ioctl(fd, iorw!($ioty, $nr, len) as $crate::libc::c_ulong, val))
195192
}
196193
);
197194
}

0 commit comments

Comments
 (0)