Skip to content

Commit 432ab3f

Browse files
noxnox
committed
Bump bitflags to 0.7
1 parent 1b4656f commit 432ab3f

21 files changed

+58
-58
lines changed

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ signalfd = []
2424

2525
[dependencies]
2626
libc = { git = "https://github.com/rust-lang/libc" }
27-
bitflags = "0.4"
27+
bitflags = "0.7"
2828
cfg-if = "0.1.0"
2929
void = "1.0.2"
3030

‎src/fcntl.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ mod consts {
138138
use libc::{self, c_int, c_uint};
139139

140140
bitflags! {
141-
flags SpliceFFlags: c_uint {
141+
pub flags SpliceFFlags: c_uint {
142142
const SPLICE_F_MOVE = libc::SPLICE_F_MOVE,
143143
const SPLICE_F_NONBLOCK = libc::SPLICE_F_NONBLOCK,
144144
const SPLICE_F_MORE = libc::SPLICE_F_MORE,
@@ -147,7 +147,7 @@ mod consts {
147147
}
148148

149149
bitflags!(
150-
flags OFlag: c_int {
150+
pub flags OFlag: c_int {
151151
const O_ACCMODE = 0o00000003,
152152
const O_RDONLY = 0o00000000,
153153
const O_WRONLY = 0o00000001,
@@ -173,13 +173,13 @@ mod consts {
173173
);
174174

175175
bitflags!(
176-
flags FdFlag: c_int {
176+
pub flags FdFlag: c_int {
177177
const FD_CLOEXEC = 1
178178
}
179179
);
180180

181181
bitflags!(
182-
flags SealFlag: c_int {
182+
pub flags SealFlag: c_int {
183183
const F_SEAL_SEAL = 1,
184184
const F_SEAL_SHRINK = 2,
185185
const F_SEAL_GROW = 4,
@@ -194,7 +194,7 @@ mod consts {
194194
use libc::c_int;
195195

196196
bitflags!(
197-
flags OFlag: c_int {
197+
pub flags OFlag: c_int {
198198
const O_ACCMODE = 0x0000003,
199199
const O_RDONLY = 0x0000000,
200200
const O_WRONLY = 0x0000001,
@@ -216,7 +216,7 @@ mod consts {
216216
);
217217

218218
bitflags!(
219-
flags FdFlag: c_int {
219+
pub flags FdFlag: c_int {
220220
const FD_CLOEXEC = 1
221221
}
222222
);
@@ -227,7 +227,7 @@ mod consts {
227227
use libc::c_int;
228228

229229
bitflags!(
230-
flags OFlag: c_int {
230+
pub flags OFlag: c_int {
231231
const O_ACCMODE = 0x0000003,
232232
const O_RDONLY = 0x0000000,
233233
const O_WRONLY = 0x0000001,
@@ -253,7 +253,7 @@ mod consts {
253253
);
254254

255255
bitflags!(
256-
flags FdFlag: c_int {
256+
pub flags FdFlag: c_int {
257257
const FD_CLOEXEC = 1
258258
}
259259
);
@@ -264,7 +264,7 @@ mod consts {
264264
use libc::c_int;
265265

266266
bitflags!(
267-
flags OFlag: c_int {
267+
pub flags OFlag: c_int {
268268
const O_ACCMODE = 0x0000003,
269269
const O_RDONLY = 0x0000000,
270270
const O_WRONLY = 0x0000001,
@@ -294,7 +294,7 @@ mod consts {
294294
);
295295

296296
bitflags!(
297-
flags FdFlag: c_int {
297+
pub flags FdFlag: c_int {
298298
const FD_CLOEXEC = 1
299299
}
300300
);
@@ -305,7 +305,7 @@ mod consts {
305305
use libc::c_int;
306306

307307
bitflags!(
308-
flags OFlag: c_int {
308+
pub flags OFlag: c_int {
309309
const O_ACCMODE = 0x0000003,
310310
const O_RDONLY = 0x0000000,
311311
const O_WRONLY = 0x0000001,
@@ -329,7 +329,7 @@ mod consts {
329329
);
330330

331331
bitflags!(
332-
flags FdFlag: c_int {
332+
pub flags FdFlag: c_int {
333333
const FD_CLOEXEC = 1
334334
}
335335
);

‎src/macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ macro_rules! libc_bitflags {
150150
// (non-pub) Entry rule.
151151
(
152152
$(#[$attr:meta])*
153-
flags $BitFlags:ident: $T:ty {
153+
pub flags $BitFlags:ident: $T:ty {
154154
$($vals:tt)*
155155
}
156156
) => {

‎src/mount.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use libc;
33
use {Errno, Result, NixPath};
44

55
bitflags!(
6-
flags MsFlags: c_ulong {
6+
pub flags MsFlags: c_ulong {
77
const MS_RDONLY = 1 << 0, // Mount read-only
88
const MS_NOSUID = 1 << 1, // Ignore suid and sgid bits
99
const MS_NODEV = 1 << 2, // Disallow access to device special files
@@ -42,7 +42,7 @@ bitflags!(
4242
);
4343

4444
bitflags!(
45-
flags MntFlags: c_int {
45+
pub flags MntFlags: c_int {
4646
const MNT_FORCE = 1 << 0,
4747
const MNT_DETACH = 1 << 1,
4848
const MNT_EXPIRE = 1 << 2

‎src/mqueue.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use sys::stat::Mode;
1010
use std::mem;
1111

1212
libc_bitflags!{
13-
flags MQ_OFlag: libc::c_int {
13+
pub flags MQ_OFlag: libc::c_int {
1414
O_RDONLY,
1515
O_WRONLY,
1616
O_RDWR,
@@ -22,7 +22,7 @@ libc_bitflags!{
2222
}
2323

2424
libc_bitflags!{
25-
flags FdFlag: libc::c_int {
25+
pub flags FdFlag: libc::c_int {
2626
FD_CLOEXEC,
2727
}
2828
}

‎src/poll.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl PollFd {
2424
}
2525

2626
libc_bitflags! {
27-
flags EventFlags: libc::c_short {
27+
pub flags EventFlags: libc::c_short {
2828
POLLIN,
2929
POLLPRI,
3030
POLLOUT,

‎src/sched.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use {Errno, Error, Result};
77
// For some functions taking with a parameter of type CloneFlags,
88
// only a subset of these flags have an effect.
99
libc_bitflags!{
10-
flags CloneFlags: libc::c_int {
10+
pub flags CloneFlags: libc::c_int {
1111
CLONE_VM,
1212
CLONE_FS,
1313
CLONE_FILES,

‎src/sys/epoll.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::os::unix::io::RawFd;
44

55
bitflags!(
66
#[repr(C)]
7-
flags EpollFlags: u32 {
7+
pub flags EpollFlags: u32 {
88
const EPOLLIN = 0x001,
99
const EPOLLPRI = 0x002,
1010
const EPOLLOUT = 0x004,
@@ -32,7 +32,7 @@ pub enum EpollOp {
3232
}
3333

3434
libc_bitflags!{
35-
flags EpollCreateFlags: c_int {
35+
pub flags EpollCreateFlags: c_int {
3636
EPOLL_CLOEXEC,
3737
}
3838
}

‎src/sys/event.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ pub enum EventFilter {
114114

115115
#[cfg(not(any(target_os = "dragonfly", target_os = "netbsd")))]
116116
bitflags!(
117-
flags EventFlag: u16 {
117+
pub flags EventFlag: u16 {
118118
const EV_ADD = 0x0001,
119119
const EV_DELETE = 0x0002,
120120
const EV_ENABLE = 0x0004,
@@ -133,7 +133,7 @@ bitflags!(
133133

134134
#[cfg(target_os = "dragonfly")]
135135
bitflags!(
136-
flags EventFlag: u16 {
136+
pub flags EventFlag: u16 {
137137
const EV_ADD = 0x0001,
138138
const EV_DELETE = 0x0002,
139139
const EV_ENABLE = 0x0004,
@@ -151,7 +151,7 @@ bitflags!(
151151

152152
#[cfg(target_os = "netbsd")]
153153
bitflags!(
154-
flags EventFlag: u32 {
154+
pub flags EventFlag: u32 {
155155
const EV_ADD = 0x0001,
156156
const EV_DELETE = 0x0002,
157157
const EV_ENABLE = 0x0004,
@@ -168,7 +168,7 @@ bitflags!(
168168

169169
#[cfg(not(any(target_os = "dragonfly", target_os="netbsd")))]
170170
bitflags!(
171-
flags FilterFlag: u32 {
171+
pub flags FilterFlag: u32 {
172172
const NOTE_TRIGGER = 0x01000000,
173173
const NOTE_FFNOP = 0x00000000,
174174
const NOTE_FFAND = 0x40000000,
@@ -216,7 +216,7 @@ bitflags!(
216216

217217
#[cfg(target_os = "dragonfly")]
218218
bitflags!(
219-
flags FilterFlag: u32 {
219+
pub flags FilterFlag: u32 {
220220
const NOTE_TRIGGER = 0x01000000,
221221
const NOTE_FFNOP = 0x00000000,
222222
const NOTE_FFAND = 0x40000000,
@@ -246,7 +246,7 @@ bitflags!(
246246

247247
#[cfg(target_os = "netbsd")]
248248
bitflags!(
249-
flags FilterFlag: u32 {
249+
pub flags FilterFlag: u32 {
250250
const NOTE_LOWAT = 0x00000001,
251251
const NOTE_DELETE = 0x00000001,
252252
const NOTE_WRITE = 0x00000002,

‎src/sys/eventfd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::os::unix::io::RawFd;
33
use {Errno, Result};
44

55
libc_bitflags! {
6-
flags EfdFlags: libc::c_int {
6+
pub flags EfdFlags: libc::c_int {
77
const EFD_CLOEXEC, // Since Linux 2.6.27
88
const EFD_NONBLOCK, // Since Linux 2.6.27
99
const EFD_SEMAPHORE, // Since Linux 2.6.30

‎src/sys/memfd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use {Errno, Result};
44
use std::ffi::CStr;
55

66
bitflags!(
7-
flags MemFdCreateFlag: libc::c_uint {
7+
pub flags MemFdCreateFlag: libc::c_uint {
88
const MFD_CLOEXEC = 0x0001,
99
const MFD_ALLOW_SEALING = 0x0002,
1010
}

‎src/sys/mman.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::os::unix::io::RawFd;
77
pub use self::consts::*;
88

99
libc_bitflags!{
10-
flags ProtFlags: libc::c_int {
10+
pub flags ProtFlags: libc::c_int {
1111
PROT_NONE,
1212
PROT_READ,
1313
PROT_WRITE,
@@ -24,7 +24,7 @@ mod consts {
2424
use libc::{self, c_int};
2525

2626
bitflags!{
27-
flags MapFlags: c_int {
27+
pub flags MapFlags: c_int {
2828
const MAP_FILE = libc::MAP_FILE,
2929
const MAP_SHARED = libc::MAP_SHARED,
3030
const MAP_PRIVATE = libc::MAP_PRIVATE,
@@ -65,7 +65,7 @@ mod consts {
6565

6666

6767
bitflags!{
68-
flags MsFlags: c_int {
68+
pub flags MsFlags: c_int {
6969
const MS_ASYNC = libc::MS_ASYNC,
7070
const MS_INVALIDATE = libc::MS_INVALIDATE,
7171
const MS_SYNC = libc::MS_SYNC,
@@ -81,7 +81,7 @@ mod consts {
8181
use libc::{self, c_int};
8282

8383
bitflags!{
84-
flags MapFlags: c_int {
84+
pub flags MapFlags: c_int {
8585
const MAP_FILE = libc::MAP_FILE,
8686
const MAP_SHARED = libc::MAP_SHARED,
8787
const MAP_PRIVATE = libc::MAP_PRIVATE,
@@ -106,7 +106,7 @@ mod consts {
106106
pub const MADV_CAN_REUSE : MmapAdvise = 9;
107107

108108
bitflags!{
109-
flags MsFlags: c_int {
109+
pub flags MsFlags: c_int {
110110
const MS_ASYNC = libc::MS_ASYNC, /* [MF|SIO] return immediately */
111111
const MS_INVALIDATE = libc::MS_INVALIDATE, /* [MF|SIO] invalidate all cached data */
112112
const MS_KILLPAGES = libc::MS_KILLPAGES, /* invalidate pages, leave mapped */
@@ -123,7 +123,7 @@ mod consts {
123123
use libc::{self, c_int};
124124

125125
bitflags!{
126-
flags MapFlags: c_int {
126+
pub flags MapFlags: c_int {
127127
const MAP_FILE = libc::MAP_FILE,
128128
const MAP_SHARED = libc::MAP_SHARED,
129129
const MAP_PRIVATE = libc::MAP_PRIVATE,
@@ -161,7 +161,7 @@ mod consts {
161161
pub const MADV_SETMAP : MmapAdvise = 11; /* set page table directory page for map */
162162

163163
bitflags!{
164-
flags MsFlags: c_int {
164+
pub flags MsFlags: c_int {
165165
const MS_ASYNC = libc::MS_ASYNC, /* [MF|SIO] return immediately */
166166
const MS_INVALIDATE = libc::MS_INVALIDATE, /* [MF|SIO] invalidate all cached data */
167167
#[cfg(not(target_os = "dragonfly"))]

‎src/sys/quota.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pub mod quota {
4141

4242
bitflags!(
4343
#[derive(Default)]
44-
flags QuotaValidFlags: u32 {
44+
pub flags QuotaValidFlags: u32 {
4545
const QIF_BLIMITS = 1,
4646
const QIF_SPACE = 2,
4747
const QIF_ILIMITS = 4,

‎src/sys/signal.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ pub const SIGPOLL : Signal = SIGIO;
195195
pub const SIGUNUSED : Signal = SIGSYS;
196196

197197
bitflags!{
198-
flags SaFlags: libc::c_int {
198+
pub flags SaFlags: libc::c_int {
199199
const SA_NOCLDSTOP = libc::SA_NOCLDSTOP,
200200
const SA_NOCLDWAIT = libc::SA_NOCLDWAIT,
201201
const SA_NODEFER = libc::SA_NODEFER,
@@ -207,7 +207,7 @@ bitflags!{
207207
}
208208

209209
bitflags!{
210-
flags SigFlags: libc::c_int {
210+
pub flags SigFlags: libc::c_int {
211211
const SIG_BLOCK = libc::SIG_BLOCK,
212212
const SIG_UNBLOCK = libc::SIG_UNBLOCK,
213213
const SIG_SETMASK = libc::SIG_SETMASK,

‎src/sys/signalfd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use std::mem;
2626

2727

2828
bitflags!{
29-
flags SfdFlags: libc::c_int {
29+
pub flags SfdFlags: libc::c_int {
3030
const SFD_NONBLOCK = libc::SFD_NONBLOCK,
3131
const SFD_CLOEXEC = libc::SFD_CLOEXEC,
3232
}

‎src/sys/socket/consts.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ mod os {
9090

9191
// Flags for send/recv and their relatives
9292
bitflags!{
93-
flags MsgFlags : libc::c_int {
93+
pub flags MsgFlags : libc::c_int {
9494
const MSG_OOB = 0x0001,
9595
const MSG_PEEK = 0x0002,
9696
const MSG_CTRUNC = 0x0008,
@@ -225,7 +225,7 @@ mod os {
225225

226226
// Flags for send/recv and their relatives
227227
bitflags!{
228-
flags MsgFlags : libc::c_int {
228+
pub flags MsgFlags : libc::c_int {
229229
const MSG_OOB = 0x01,
230230
const MSG_PEEK = 0x02,
231231
const MSG_EOR = 0x08,
@@ -311,7 +311,7 @@ mod os {
311311

312312
// Flags for send/recv and their relatives
313313
bitflags!{
314-
flags MsgFlags : libc::c_int {
314+
pub flags MsgFlags : libc::c_int {
315315
const MSG_OOB = 0x01,
316316
const MSG_PEEK = 0x02,
317317
const MSG_DONTWAIT = 0x80,

0 commit comments

Comments
 (0)