From 432ab3ff55cd1c44b090817bc0c1ca290db830e1 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 27 Sep 2016 15:20:07 +0200 Subject: [PATCH] Bump bitflags to 0.7 --- Cargo.toml | 2 +- src/fcntl.rs | 24 ++++++++++++------------ src/macros.rs | 2 +- src/mount.rs | 4 ++-- src/mqueue.rs | 4 ++-- src/poll.rs | 2 +- src/sched.rs | 2 +- src/sys/epoll.rs | 4 ++-- src/sys/event.rs | 12 ++++++------ src/sys/eventfd.rs | 2 +- src/sys/memfd.rs | 2 +- src/sys/mman.rs | 14 +++++++------- src/sys/quota.rs | 2 +- src/sys/signal.rs | 4 ++-- src/sys/signalfd.rs | 2 +- src/sys/socket/consts.rs | 6 +++--- src/sys/socket/mod.rs | 2 +- src/sys/stat.rs | 4 ++-- src/sys/statvfs.rs | 2 +- src/sys/termios.rs | 16 ++++++++-------- src/sys/wait.rs | 4 ++-- 21 files changed, 58 insertions(+), 58 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9302181c9a..9560e3ff6e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ signalfd = [] [dependencies] libc = { git = "https://github.com/rust-lang/libc" } -bitflags = "0.4" +bitflags = "0.7" cfg-if = "0.1.0" void = "1.0.2" diff --git a/src/fcntl.rs b/src/fcntl.rs index 1d9ba4998d..29889b3ddb 100644 --- a/src/fcntl.rs +++ b/src/fcntl.rs @@ -138,7 +138,7 @@ mod consts { use libc::{self, c_int, c_uint}; bitflags! { - flags SpliceFFlags: c_uint { + pub flags SpliceFFlags: c_uint { const SPLICE_F_MOVE = libc::SPLICE_F_MOVE, const SPLICE_F_NONBLOCK = libc::SPLICE_F_NONBLOCK, const SPLICE_F_MORE = libc::SPLICE_F_MORE, @@ -147,7 +147,7 @@ mod consts { } bitflags!( - flags OFlag: c_int { + pub flags OFlag: c_int { const O_ACCMODE = 0o00000003, const O_RDONLY = 0o00000000, const O_WRONLY = 0o00000001, @@ -173,13 +173,13 @@ mod consts { ); bitflags!( - flags FdFlag: c_int { + pub flags FdFlag: c_int { const FD_CLOEXEC = 1 } ); bitflags!( - flags SealFlag: c_int { + pub flags SealFlag: c_int { const F_SEAL_SEAL = 1, const F_SEAL_SHRINK = 2, const F_SEAL_GROW = 4, @@ -194,7 +194,7 @@ mod consts { use libc::c_int; bitflags!( - flags OFlag: c_int { + pub flags OFlag: c_int { const O_ACCMODE = 0x0000003, const O_RDONLY = 0x0000000, const O_WRONLY = 0x0000001, @@ -216,7 +216,7 @@ mod consts { ); bitflags!( - flags FdFlag: c_int { + pub flags FdFlag: c_int { const FD_CLOEXEC = 1 } ); @@ -227,7 +227,7 @@ mod consts { use libc::c_int; bitflags!( - flags OFlag: c_int { + pub flags OFlag: c_int { const O_ACCMODE = 0x0000003, const O_RDONLY = 0x0000000, const O_WRONLY = 0x0000001, @@ -253,7 +253,7 @@ mod consts { ); bitflags!( - flags FdFlag: c_int { + pub flags FdFlag: c_int { const FD_CLOEXEC = 1 } ); @@ -264,7 +264,7 @@ mod consts { use libc::c_int; bitflags!( - flags OFlag: c_int { + pub flags OFlag: c_int { const O_ACCMODE = 0x0000003, const O_RDONLY = 0x0000000, const O_WRONLY = 0x0000001, @@ -294,7 +294,7 @@ mod consts { ); bitflags!( - flags FdFlag: c_int { + pub flags FdFlag: c_int { const FD_CLOEXEC = 1 } ); @@ -305,7 +305,7 @@ mod consts { use libc::c_int; bitflags!( - flags OFlag: c_int { + pub flags OFlag: c_int { const O_ACCMODE = 0x0000003, const O_RDONLY = 0x0000000, const O_WRONLY = 0x0000001, @@ -329,7 +329,7 @@ mod consts { ); bitflags!( - flags FdFlag: c_int { + pub flags FdFlag: c_int { const FD_CLOEXEC = 1 } ); diff --git a/src/macros.rs b/src/macros.rs index e6d58b10d2..3afa1ae365 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -150,7 +150,7 @@ macro_rules! libc_bitflags { // (non-pub) Entry rule. ( $(#[$attr:meta])* - flags $BitFlags:ident: $T:ty { + pub flags $BitFlags:ident: $T:ty { $($vals:tt)* } ) => { diff --git a/src/mount.rs b/src/mount.rs index 6cef3fb58f..c784d73758 100644 --- a/src/mount.rs +++ b/src/mount.rs @@ -3,7 +3,7 @@ use libc; use {Errno, Result, NixPath}; bitflags!( - flags MsFlags: c_ulong { + pub flags MsFlags: c_ulong { const MS_RDONLY = 1 << 0, // Mount read-only const MS_NOSUID = 1 << 1, // Ignore suid and sgid bits const MS_NODEV = 1 << 2, // Disallow access to device special files @@ -42,7 +42,7 @@ bitflags!( ); bitflags!( - flags MntFlags: c_int { + pub flags MntFlags: c_int { const MNT_FORCE = 1 << 0, const MNT_DETACH = 1 << 1, const MNT_EXPIRE = 1 << 2 diff --git a/src/mqueue.rs b/src/mqueue.rs index 9bf6e77edb..2c127502e3 100644 --- a/src/mqueue.rs +++ b/src/mqueue.rs @@ -10,7 +10,7 @@ use sys::stat::Mode; use std::mem; libc_bitflags!{ - flags MQ_OFlag: libc::c_int { + pub flags MQ_OFlag: libc::c_int { O_RDONLY, O_WRONLY, O_RDWR, @@ -22,7 +22,7 @@ libc_bitflags!{ } libc_bitflags!{ - flags FdFlag: libc::c_int { + pub flags FdFlag: libc::c_int { FD_CLOEXEC, } } diff --git a/src/poll.rs b/src/poll.rs index 6ba9f5e45b..72988d8c3e 100644 --- a/src/poll.rs +++ b/src/poll.rs @@ -24,7 +24,7 @@ impl PollFd { } libc_bitflags! { - flags EventFlags: libc::c_short { + pub flags EventFlags: libc::c_short { POLLIN, POLLPRI, POLLOUT, diff --git a/src/sched.rs b/src/sched.rs index 91a7c42a9a..b0ec935baa 100644 --- a/src/sched.rs +++ b/src/sched.rs @@ -7,7 +7,7 @@ use {Errno, Error, Result}; // For some functions taking with a parameter of type CloneFlags, // only a subset of these flags have an effect. libc_bitflags!{ - flags CloneFlags: libc::c_int { + pub flags CloneFlags: libc::c_int { CLONE_VM, CLONE_FS, CLONE_FILES, diff --git a/src/sys/epoll.rs b/src/sys/epoll.rs index 9774318f46..5a472d69fb 100644 --- a/src/sys/epoll.rs +++ b/src/sys/epoll.rs @@ -4,7 +4,7 @@ use std::os::unix::io::RawFd; bitflags!( #[repr(C)] - flags EpollFlags: u32 { + pub flags EpollFlags: u32 { const EPOLLIN = 0x001, const EPOLLPRI = 0x002, const EPOLLOUT = 0x004, @@ -32,7 +32,7 @@ pub enum EpollOp { } libc_bitflags!{ - flags EpollCreateFlags: c_int { + pub flags EpollCreateFlags: c_int { EPOLL_CLOEXEC, } } diff --git a/src/sys/event.rs b/src/sys/event.rs index 0e94475e18..cb16604ac5 100644 --- a/src/sys/event.rs +++ b/src/sys/event.rs @@ -114,7 +114,7 @@ pub enum EventFilter { #[cfg(not(any(target_os = "dragonfly", target_os = "netbsd")))] bitflags!( - flags EventFlag: u16 { + pub flags EventFlag: u16 { const EV_ADD = 0x0001, const EV_DELETE = 0x0002, const EV_ENABLE = 0x0004, @@ -133,7 +133,7 @@ bitflags!( #[cfg(target_os = "dragonfly")] bitflags!( - flags EventFlag: u16 { + pub flags EventFlag: u16 { const EV_ADD = 0x0001, const EV_DELETE = 0x0002, const EV_ENABLE = 0x0004, @@ -151,7 +151,7 @@ bitflags!( #[cfg(target_os = "netbsd")] bitflags!( - flags EventFlag: u32 { + pub flags EventFlag: u32 { const EV_ADD = 0x0001, const EV_DELETE = 0x0002, const EV_ENABLE = 0x0004, @@ -168,7 +168,7 @@ bitflags!( #[cfg(not(any(target_os = "dragonfly", target_os="netbsd")))] bitflags!( - flags FilterFlag: u32 { + pub flags FilterFlag: u32 { const NOTE_TRIGGER = 0x01000000, const NOTE_FFNOP = 0x00000000, const NOTE_FFAND = 0x40000000, @@ -216,7 +216,7 @@ bitflags!( #[cfg(target_os = "dragonfly")] bitflags!( - flags FilterFlag: u32 { + pub flags FilterFlag: u32 { const NOTE_TRIGGER = 0x01000000, const NOTE_FFNOP = 0x00000000, const NOTE_FFAND = 0x40000000, @@ -246,7 +246,7 @@ bitflags!( #[cfg(target_os = "netbsd")] bitflags!( - flags FilterFlag: u32 { + pub flags FilterFlag: u32 { const NOTE_LOWAT = 0x00000001, const NOTE_DELETE = 0x00000001, const NOTE_WRITE = 0x00000002, diff --git a/src/sys/eventfd.rs b/src/sys/eventfd.rs index e6e410ec8f..6616020f4f 100644 --- a/src/sys/eventfd.rs +++ b/src/sys/eventfd.rs @@ -3,7 +3,7 @@ use std::os::unix::io::RawFd; use {Errno, Result}; libc_bitflags! { - flags EfdFlags: libc::c_int { + pub flags EfdFlags: libc::c_int { const EFD_CLOEXEC, // Since Linux 2.6.27 const EFD_NONBLOCK, // Since Linux 2.6.27 const EFD_SEMAPHORE, // Since Linux 2.6.30 diff --git a/src/sys/memfd.rs b/src/sys/memfd.rs index 1cd94150eb..b073500926 100644 --- a/src/sys/memfd.rs +++ b/src/sys/memfd.rs @@ -4,7 +4,7 @@ use {Errno, Result}; use std::ffi::CStr; bitflags!( - flags MemFdCreateFlag: libc::c_uint { + pub flags MemFdCreateFlag: libc::c_uint { const MFD_CLOEXEC = 0x0001, const MFD_ALLOW_SEALING = 0x0002, } diff --git a/src/sys/mman.rs b/src/sys/mman.rs index a1bf61347a..d0099541c7 100644 --- a/src/sys/mman.rs +++ b/src/sys/mman.rs @@ -7,7 +7,7 @@ use std::os::unix::io::RawFd; pub use self::consts::*; libc_bitflags!{ - flags ProtFlags: libc::c_int { + pub flags ProtFlags: libc::c_int { PROT_NONE, PROT_READ, PROT_WRITE, @@ -24,7 +24,7 @@ mod consts { use libc::{self, c_int}; bitflags!{ - flags MapFlags: c_int { + pub flags MapFlags: c_int { const MAP_FILE = libc::MAP_FILE, const MAP_SHARED = libc::MAP_SHARED, const MAP_PRIVATE = libc::MAP_PRIVATE, @@ -65,7 +65,7 @@ mod consts { bitflags!{ - flags MsFlags: c_int { + pub flags MsFlags: c_int { const MS_ASYNC = libc::MS_ASYNC, const MS_INVALIDATE = libc::MS_INVALIDATE, const MS_SYNC = libc::MS_SYNC, @@ -81,7 +81,7 @@ mod consts { use libc::{self, c_int}; bitflags!{ - flags MapFlags: c_int { + pub flags MapFlags: c_int { const MAP_FILE = libc::MAP_FILE, const MAP_SHARED = libc::MAP_SHARED, const MAP_PRIVATE = libc::MAP_PRIVATE, @@ -106,7 +106,7 @@ mod consts { pub const MADV_CAN_REUSE : MmapAdvise = 9; bitflags!{ - flags MsFlags: c_int { + pub flags MsFlags: c_int { const MS_ASYNC = libc::MS_ASYNC, /* [MF|SIO] return immediately */ const MS_INVALIDATE = libc::MS_INVALIDATE, /* [MF|SIO] invalidate all cached data */ const MS_KILLPAGES = libc::MS_KILLPAGES, /* invalidate pages, leave mapped */ @@ -123,7 +123,7 @@ mod consts { use libc::{self, c_int}; bitflags!{ - flags MapFlags: c_int { + pub flags MapFlags: c_int { const MAP_FILE = libc::MAP_FILE, const MAP_SHARED = libc::MAP_SHARED, const MAP_PRIVATE = libc::MAP_PRIVATE, @@ -161,7 +161,7 @@ mod consts { pub const MADV_SETMAP : MmapAdvise = 11; /* set page table directory page for map */ bitflags!{ - flags MsFlags: c_int { + pub flags MsFlags: c_int { const MS_ASYNC = libc::MS_ASYNC, /* [MF|SIO] return immediately */ const MS_INVALIDATE = libc::MS_INVALIDATE, /* [MF|SIO] invalidate all cached data */ #[cfg(not(target_os = "dragonfly"))] diff --git a/src/sys/quota.rs b/src/sys/quota.rs index a6a1b9b0bb..321156ec5d 100644 --- a/src/sys/quota.rs +++ b/src/sys/quota.rs @@ -41,7 +41,7 @@ pub mod quota { bitflags!( #[derive(Default)] - flags QuotaValidFlags: u32 { + pub flags QuotaValidFlags: u32 { const QIF_BLIMITS = 1, const QIF_SPACE = 2, const QIF_ILIMITS = 4, diff --git a/src/sys/signal.rs b/src/sys/signal.rs index bdc25b47e6..66236d4d7e 100644 --- a/src/sys/signal.rs +++ b/src/sys/signal.rs @@ -195,7 +195,7 @@ pub const SIGPOLL : Signal = SIGIO; pub const SIGUNUSED : Signal = SIGSYS; bitflags!{ - flags SaFlags: libc::c_int { + pub flags SaFlags: libc::c_int { const SA_NOCLDSTOP = libc::SA_NOCLDSTOP, const SA_NOCLDWAIT = libc::SA_NOCLDWAIT, const SA_NODEFER = libc::SA_NODEFER, @@ -207,7 +207,7 @@ bitflags!{ } bitflags!{ - flags SigFlags: libc::c_int { + pub flags SigFlags: libc::c_int { const SIG_BLOCK = libc::SIG_BLOCK, const SIG_UNBLOCK = libc::SIG_UNBLOCK, const SIG_SETMASK = libc::SIG_SETMASK, diff --git a/src/sys/signalfd.rs b/src/sys/signalfd.rs index f178ec7514..e11a0b9a76 100644 --- a/src/sys/signalfd.rs +++ b/src/sys/signalfd.rs @@ -26,7 +26,7 @@ use std::mem; bitflags!{ - flags SfdFlags: libc::c_int { + pub flags SfdFlags: libc::c_int { const SFD_NONBLOCK = libc::SFD_NONBLOCK, const SFD_CLOEXEC = libc::SFD_CLOEXEC, } diff --git a/src/sys/socket/consts.rs b/src/sys/socket/consts.rs index 63eaf28a01..cec2719783 100644 --- a/src/sys/socket/consts.rs +++ b/src/sys/socket/consts.rs @@ -90,7 +90,7 @@ mod os { // Flags for send/recv and their relatives bitflags!{ - flags MsgFlags : libc::c_int { + pub flags MsgFlags : libc::c_int { const MSG_OOB = 0x0001, const MSG_PEEK = 0x0002, const MSG_CTRUNC = 0x0008, @@ -225,7 +225,7 @@ mod os { // Flags for send/recv and their relatives bitflags!{ - flags MsgFlags : libc::c_int { + pub flags MsgFlags : libc::c_int { const MSG_OOB = 0x01, const MSG_PEEK = 0x02, const MSG_EOR = 0x08, @@ -311,7 +311,7 @@ mod os { // Flags for send/recv and their relatives bitflags!{ - flags MsgFlags : libc::c_int { + pub flags MsgFlags : libc::c_int { const MSG_OOB = 0x01, const MSG_PEEK = 0x02, const MSG_DONTWAIT = 0x80, diff --git a/src/sys/socket/mod.rs b/src/sys/socket/mod.rs index 69f26aa0a5..d2df5e2e65 100644 --- a/src/sys/socket/mod.rs +++ b/src/sys/socket/mod.rs @@ -73,7 +73,7 @@ pub enum SockType { // Extra flags - Supported by Linux 2.6.27, normalized on other platforms bitflags!( - flags SockFlag: c_int { + pub flags SockFlag: c_int { const SOCK_NONBLOCK = 0o0004000, const SOCK_CLOEXEC = 0o2000000 } diff --git a/src/sys/stat.rs b/src/sys/stat.rs index 076fe93347..1beb349e73 100644 --- a/src/sys/stat.rs +++ b/src/sys/stat.rs @@ -17,7 +17,7 @@ mod ffi { } bitflags!( - flags SFlag: mode_t { + pub flags SFlag: mode_t { const S_IFIFO = libc::S_IFIFO, const S_IFCHR = libc::S_IFCHR, const S_IFDIR = libc::S_IFDIR, @@ -30,7 +30,7 @@ bitflags!( ); bitflags! { - flags Mode: mode_t { + pub flags Mode: mode_t { const S_IRWXU = libc::S_IRWXU, const S_IRUSR = libc::S_IRUSR, const S_IWUSR = libc::S_IWUSR, diff --git a/src/sys/statvfs.rs b/src/sys/statvfs.rs index 5b72a16bd8..21067bd64c 100644 --- a/src/sys/statvfs.rs +++ b/src/sys/statvfs.rs @@ -21,7 +21,7 @@ pub mod vfs { /// Mount Flags #[repr(C)] #[derive(Default)] - flags FsFlags: c_ulong { + pub flags FsFlags: c_ulong { /// Read Only const RDONLY = 1, /// Do not allow the set-uid bits to have an effect diff --git a/src/sys/termios.rs b/src/sys/termios.rs index 41aae186ed..9622f39222 100644 --- a/src/sys/termios.rs +++ b/src/sys/termios.rs @@ -146,7 +146,7 @@ mod ffi { pub const NCCS: usize = 20; bitflags! { - flags InputFlags: tcflag_t { + pub flags InputFlags: tcflag_t { const IGNBRK = 0x00000001, const BRKINT = 0x00000002, const IGNPAR = 0x00000004, @@ -166,7 +166,7 @@ mod ffi { } bitflags! { - flags OutputFlags: tcflag_t { + pub flags OutputFlags: tcflag_t { const OPOST = 0x00000001, const ONLCR = 0x00000002, const OXTABS = 0x00000004, @@ -175,7 +175,7 @@ mod ffi { } bitflags! { - flags ControlFlags: tcflag_t { + pub flags ControlFlags: tcflag_t { const CIGNORE = 0x00000001, const CSIZE = 0x00000300, const CS5 = 0x00000000, @@ -199,7 +199,7 @@ mod ffi { } bitflags! { - flags LocalFlags: tcflag_t { + pub flags LocalFlags: tcflag_t { const ECHOKE = 0x00000001, const ECHOE = 0x00000002, const ECHOK = 0x00000004, @@ -312,7 +312,7 @@ mod ffi { pub const NCCS: usize = 32; bitflags! { - flags InputFlags: tcflag_t { + pub flags InputFlags: tcflag_t { const IGNBRK = 0x00000001, const BRKINT = 0x00000002, const IGNPAR = 0x00000004, @@ -331,14 +331,14 @@ mod ffi { } bitflags! { - flags OutputFlags: tcflag_t { + pub flags OutputFlags: tcflag_t { const OPOST = 0x00000001, const ONLCR = 0x00000004, } } bitflags! { - flags ControlFlags: tcflag_t { + pub flags ControlFlags: tcflag_t { const CSIZE = 0x00000030, const CS5 = 0x00000000, const CS6 = 0x00000010, @@ -357,7 +357,7 @@ mod ffi { } bitflags! { - flags LocalFlags: tcflag_t { + pub flags LocalFlags: tcflag_t { const ECHOKE = 0x00000800, const ECHOE = 0x00000010, const ECHOK = 0x00000020, diff --git a/src/sys/wait.rs b/src/sys/wait.rs index 259efb7092..12cbd9e060 100644 --- a/src/sys/wait.rs +++ b/src/sys/wait.rs @@ -14,7 +14,7 @@ mod ffi { #[cfg(not(any(target_os = "linux", target_os = "android")))] bitflags!( - flags WaitPidFlag: c_int { + pub flags WaitPidFlag: c_int { const WNOHANG = libc::WNOHANG, const WUNTRACED = libc::WUNTRACED, } @@ -23,7 +23,7 @@ bitflags!( #[cfg(any(target_os = "linux", target_os = "android"))] bitflags!( - flags WaitPidFlag: c_int { + pub flags WaitPidFlag: c_int { const WNOHANG = libc::WNOHANG, const WUNTRACED = libc::WUNTRACED, const WEXITED = libc::WEXITED,