Skip to content

Commit ebfd5c0

Browse files
bors[bot]bors[bot]
committed
Merge #620
620: Update bitflags to 0.9 r=asomers
2 parents ab5435e + f049edd commit ebfd5c0

File tree

11 files changed

+331
-331
lines changed

11 files changed

+331
-331
lines changed

‎Cargo.toml‎

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

2424
[dependencies]
2525
libc = { git = "https://github.com/rust-lang/libc" }
26-
bitflags = "0.7"
26+
bitflags = "0.9"
2727
cfg-if = "0.1.0"
2828
void = "1.0.2"
2929

‎src/fcntl.rs‎

Lines changed: 125 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ libc_bitflags!{
3333

3434
#[cfg(any(target_os = "ios", target_os = "macos"))]
3535
bitflags!(
36-
pub flags AtFlags: c_int {
36+
pub struct AtFlags: c_int {
3737
// hack because bitflags require one entry
38-
const EMPTY = 0x0
38+
const EMPTY = 0x0;
3939
}
4040
);
4141

@@ -213,43 +213,43 @@ mod consts {
213213
}
214214

215215
bitflags!(
216-
pub flags OFlag: c_int {
217-
const O_ACCMODE = libc::O_ACCMODE,
218-
const O_RDONLY = libc::O_RDONLY,
219-
const O_WRONLY = libc::O_WRONLY,
220-
const O_RDWR = libc::O_RDWR,
221-
const O_CREAT = libc::O_CREAT,
222-
const O_EXCL = libc::O_EXCL,
223-
const O_NOCTTY = libc::O_NOCTTY,
224-
const O_TRUNC = libc::O_TRUNC,
225-
const O_APPEND = libc::O_APPEND,
226-
const O_NONBLOCK = libc::O_NONBLOCK,
227-
const O_DSYNC = libc::O_DSYNC,
228-
const O_DIRECT = libc::O_DIRECT,
229-
const O_LARGEFILE = 0o00100000,
230-
const O_DIRECTORY = libc::O_DIRECTORY,
231-
const O_NOFOLLOW = libc::O_NOFOLLOW,
232-
const O_NOATIME = 0o01000000,
233-
const O_CLOEXEC = libc::O_CLOEXEC,
234-
const O_SYNC = libc::O_SYNC,
235-
const O_PATH = 0o10000000,
236-
const O_TMPFILE = libc::O_TMPFILE,
237-
const O_NDELAY = libc::O_NDELAY,
216+
pub struct OFlag: c_int {
217+
const O_ACCMODE = libc::O_ACCMODE;
218+
const O_RDONLY = libc::O_RDONLY;
219+
const O_WRONLY = libc::O_WRONLY;
220+
const O_RDWR = libc::O_RDWR;
221+
const O_CREAT = libc::O_CREAT;
222+
const O_EXCL = libc::O_EXCL;
223+
const O_NOCTTY = libc::O_NOCTTY;
224+
const O_TRUNC = libc::O_TRUNC;
225+
const O_APPEND = libc::O_APPEND;
226+
const O_NONBLOCK = libc::O_NONBLOCK;
227+
const O_DSYNC = libc::O_DSYNC;
228+
const O_DIRECT = libc::O_DIRECT;
229+
const O_LARGEFILE = 0o00100000;
230+
const O_DIRECTORY = libc::O_DIRECTORY;
231+
const O_NOFOLLOW = libc::O_NOFOLLOW;
232+
const O_NOATIME = 0o01000000;
233+
const O_CLOEXEC = libc::O_CLOEXEC;
234+
const O_SYNC = libc::O_SYNC;
235+
const O_PATH = 0o10000000;
236+
const O_TMPFILE = libc::O_TMPFILE;
237+
const O_NDELAY = libc::O_NDELAY;
238238
}
239239
);
240240

241241
bitflags!(
242-
pub flags FdFlag: c_int {
243-
const FD_CLOEXEC = 1
242+
pub struct FdFlag: c_int {
243+
const FD_CLOEXEC = 1;
244244
}
245245
);
246246

247247
bitflags!(
248-
pub flags SealFlag: c_int {
249-
const F_SEAL_SEAL = 1,
250-
const F_SEAL_SHRINK = 2,
251-
const F_SEAL_GROW = 4,
252-
const F_SEAL_WRITE = 8,
248+
pub struct SealFlag: c_int {
249+
const F_SEAL_SEAL = 1;
250+
const F_SEAL_SHRINK = 2;
251+
const F_SEAL_GROW = 4;
252+
const F_SEAL_WRITE = 8;
253253
}
254254
);
255255

@@ -260,30 +260,30 @@ mod consts {
260260
use libc::{self, c_int};
261261

262262
bitflags!(
263-
pub flags OFlag: c_int {
264-
const O_ACCMODE = libc::O_ACCMODE,
265-
const O_RDONLY = libc::O_RDONLY,
266-
const O_WRONLY = libc::O_WRONLY,
267-
const O_RDWR = libc::O_RDWR,
268-
const O_CREAT = libc::O_CREAT,
269-
const O_EXCL = libc::O_EXCL,
270-
const O_NOCTTY = libc::O_NOCTTY,
271-
const O_TRUNC = libc::O_TRUNC,
272-
const O_APPEND = libc::O_APPEND,
273-
const O_NONBLOCK = libc::O_NONBLOCK,
274-
const O_DSYNC = libc::O_DSYNC,
275-
const O_DIRECTORY = libc::O_DIRECTORY,
276-
const O_NOFOLLOW = libc::O_NOFOLLOW,
277-
const O_CLOEXEC = libc::O_CLOEXEC,
278-
const O_SYNC = libc::O_SYNC,
279-
const O_NDELAY = O_NONBLOCK.bits,
280-
const O_FSYNC = libc::O_FSYNC,
263+
pub struct OFlag: c_int {
264+
const O_ACCMODE = libc::O_ACCMODE;
265+
const O_RDONLY = libc::O_RDONLY;
266+
const O_WRONLY = libc::O_WRONLY;
267+
const O_RDWR = libc::O_RDWR;
268+
const O_CREAT = libc::O_CREAT;
269+
const O_EXCL = libc::O_EXCL;
270+
const O_NOCTTY = libc::O_NOCTTY;
271+
const O_TRUNC = libc::O_TRUNC;
272+
const O_APPEND = libc::O_APPEND;
273+
const O_NONBLOCK = libc::O_NONBLOCK;
274+
const O_DSYNC = libc::O_DSYNC;
275+
const O_DIRECTORY = libc::O_DIRECTORY;
276+
const O_NOFOLLOW = libc::O_NOFOLLOW;
277+
const O_CLOEXEC = libc::O_CLOEXEC;
278+
const O_SYNC = libc::O_SYNC;
279+
const O_NDELAY = O_NONBLOCK.bits;
280+
const O_FSYNC = libc::O_FSYNC;
281281
}
282282
);
283283

284284
bitflags!(
285-
pub flags FdFlag: c_int {
286-
const FD_CLOEXEC = 1
285+
pub struct FdFlag: c_int {
286+
const FD_CLOEXEC = 1;
287287
}
288288
);
289289
}
@@ -293,34 +293,34 @@ mod consts {
293293
use libc::{self, c_int};
294294

295295
bitflags!(
296-
pub flags OFlag: c_int {
297-
const O_ACCMODE = libc::O_ACCMODE,
298-
const O_RDONLY = libc::O_RDONLY,
299-
const O_WRONLY = libc::O_WRONLY,
300-
const O_RDWR = libc::O_RDWR,
301-
const O_CREAT = libc::O_CREAT,
302-
const O_EXCL = libc::O_EXCL,
303-
const O_NOCTTY = libc::O_NOCTTY,
304-
const O_TRUNC = libc::O_TRUNC,
305-
const O_APPEND = libc::O_APPEND,
306-
const O_NONBLOCK = libc::O_NONBLOCK,
307-
const O_DIRECTORY = 0x0020000,
308-
const O_NOFOLLOW = libc::O_NOFOLLOW,
309-
const O_CLOEXEC = libc::O_CLOEXEC,
310-
const O_SYNC = libc::O_SYNC,
311-
const O_NDELAY = libc::O_NDELAY,
312-
const O_FSYNC = libc::O_FSYNC,
313-
const O_SHLOCK = 0x0000080,
314-
const O_EXLOCK = 0x0000020,
315-
const O_DIRECT = 0x0010000,
316-
const O_EXEC = 0x0040000,
317-
const O_TTY_INIT = 0x0080000
296+
pub struct OFlag: c_int {
297+
const O_ACCMODE = libc::O_ACCMODE;
298+
const O_RDONLY = libc::O_RDONLY;
299+
const O_WRONLY = libc::O_WRONLY;
300+
const O_RDWR = libc::O_RDWR;
301+
const O_CREAT = libc::O_CREAT;
302+
const O_EXCL = libc::O_EXCL;
303+
const O_NOCTTY = libc::O_NOCTTY;
304+
const O_TRUNC = libc::O_TRUNC;
305+
const O_APPEND = libc::O_APPEND;
306+
const O_NONBLOCK = libc::O_NONBLOCK;
307+
const O_DIRECTORY = 0x0020000;
308+
const O_NOFOLLOW = libc::O_NOFOLLOW;
309+
const O_CLOEXEC = libc::O_CLOEXEC;
310+
const O_SYNC = libc::O_SYNC;
311+
const O_NDELAY = libc::O_NDELAY;
312+
const O_FSYNC = libc::O_FSYNC;
313+
const O_SHLOCK = 0x0000080;
314+
const O_EXLOCK = 0x0000020;
315+
const O_DIRECT = 0x0010000;
316+
const O_EXEC = 0x0040000;
317+
const O_TTY_INIT = 0x0080000;
318318
}
319319
);
320320

321321
bitflags!(
322-
pub flags FdFlag: c_int {
323-
const FD_CLOEXEC = 1
322+
pub struct FdFlag: c_int {
323+
const FD_CLOEXEC = 1;
324324
}
325325
);
326326
}
@@ -330,38 +330,38 @@ mod consts {
330330
use libc::c_int;
331331

332332
bitflags!(
333-
pub flags OFlag: c_int {
334-
const O_ACCMODE = 0x0000003,
335-
const O_RDONLY = 0x0000000,
336-
const O_WRONLY = 0x0000001,
337-
const O_RDWR = 0x0000002,
338-
const O_NONBLOCK = 0x0000004,
339-
const O_APPEND = 0x0000008,
340-
const O_SHLOCK = 0x0000010,
341-
const O_EXLOCK = 0x0000020,
342-
const O_ASYNC = 0x0000040,
343-
const O_SYNC = 0x0000080,
344-
const O_NOFOLLOW = 0x0000100,
345-
const O_CREAT = 0x0000200,
346-
const O_TRUNC = 0x0000400,
347-
const O_EXCL = 0x0000800,
348-
const O_NOCTTY = 0x0008000,
349-
const O_DSYNC = 0x0010000,
350-
const O_RSYNC = 0x0020000,
351-
const O_ALT_IO = 0x0040000,
352-
const O_DIRECT = 0x0080000,
353-
const O_NOSIGPIPE = 0x0100000,
354-
const O_DIRECTORY = 0x0200000,
355-
const O_CLOEXEC = 0x0400000,
356-
const O_SEARCH = 0x0800000,
357-
const O_FSYNC = O_SYNC.bits,
358-
const O_NDELAY = O_NONBLOCK.bits,
333+
pub struct OFlag: c_int {
334+
const O_ACCMODE = 0x0000003;
335+
const O_RDONLY = 0x0000000;
336+
const O_WRONLY = 0x0000001;
337+
const O_RDWR = 0x0000002;
338+
const O_NONBLOCK = 0x0000004;
339+
const O_APPEND = 0x0000008;
340+
const O_SHLOCK = 0x0000010;
341+
const O_EXLOCK = 0x0000020;
342+
const O_ASYNC = 0x0000040;
343+
const O_SYNC = 0x0000080;
344+
const O_NOFOLLOW = 0x0000100;
345+
const O_CREAT = 0x0000200;
346+
const O_TRUNC = 0x0000400;
347+
const O_EXCL = 0x0000800;
348+
const O_NOCTTY = 0x0008000;
349+
const O_DSYNC = 0x0010000;
350+
const O_RSYNC = 0x0020000;
351+
const O_ALT_IO = 0x0040000;
352+
const O_DIRECT = 0x0080000;
353+
const O_NOSIGPIPE = 0x0100000;
354+
const O_DIRECTORY = 0x0200000;
355+
const O_CLOEXEC = 0x0400000;
356+
const O_SEARCH = 0x0800000;
357+
const O_FSYNC = O_SYNC.bits;
358+
const O_NDELAY = O_NONBLOCK.bits;
359359
}
360360
);
361361

362362
bitflags!(
363-
pub flags FdFlag: c_int {
364-
const FD_CLOEXEC = 1
363+
pub struct FdFlag: c_int {
364+
const FD_CLOEXEC = 1;
365365
}
366366
);
367367
}
@@ -371,32 +371,32 @@ mod consts {
371371
use libc::c_int;
372372

373373
bitflags!(
374-
pub flags OFlag: c_int {
375-
const O_ACCMODE = 0x0000003,
376-
const O_RDONLY = 0x0000000,
377-
const O_WRONLY = 0x0000001,
378-
const O_RDWR = 0x0000002,
379-
const O_CREAT = 0x0000200,
380-
const O_EXCL = 0x0000800,
381-
const O_NOCTTY = 0x0008000,
382-
const O_TRUNC = 0x0000400,
383-
const O_APPEND = 0x0000008,
384-
const O_NONBLOCK = 0x0000004,
385-
const O_DIRECTORY = 0x8000000, // different from FreeBSD!
386-
const O_NOFOLLOW = 0x0000100,
387-
const O_CLOEXEC = 0x0020000, // different from FreeBSD!
388-
const O_SYNC = 0x0000080,
389-
const O_NDELAY = O_NONBLOCK.bits,
390-
const O_FSYNC = O_SYNC.bits,
391-
const O_SHLOCK = 0x0000010, // different from FreeBSD!
392-
const O_EXLOCK = 0x0000020,
393-
const O_DIRECT = 0x0010000,
374+
pub struct OFlag: c_int {
375+
const O_ACCMODE = 0x0000003;
376+
const O_RDONLY = 0x0000000;
377+
const O_WRONLY = 0x0000001;
378+
const O_RDWR = 0x0000002;
379+
const O_CREAT = 0x0000200;
380+
const O_EXCL = 0x0000800;
381+
const O_NOCTTY = 0x0008000;
382+
const O_TRUNC = 0x0000400;
383+
const O_APPEND = 0x0000008;
384+
const O_NONBLOCK = 0x0000004;
385+
const O_DIRECTORY = 0x8000000; // different from FreeBSD!
386+
const O_NOFOLLOW = 0x0000100;
387+
const O_CLOEXEC = 0x0020000; // different from FreeBSD!
388+
const O_SYNC = 0x0000080;
389+
const O_NDELAY = O_NONBLOCK.bits;
390+
const O_FSYNC = O_SYNC.bits;
391+
const O_SHLOCK = 0x0000010; // different from FreeBSD!
392+
const O_EXLOCK = 0x0000020;
393+
const O_DIRECT = 0x0010000;
394394
}
395395
);
396396

397397
bitflags!(
398-
pub flags FdFlag: c_int {
399-
const FD_CLOEXEC = 1
398+
pub struct FdFlag: c_int {
399+
const FD_CLOEXEC = 1;
400400
}
401401
);
402402
}

‎src/macros.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ macro_rules! libc_bitflags {
4949
) => {
5050
bitflags! {
5151
$($attrs)*
52-
pub flags $BitFlags: $T {
52+
pub struct $BitFlags: $T {
5353
$($flags)*
5454
}
5555
}
@@ -125,7 +125,7 @@ macro_rules! libc_bitflags {
125125
$prefix,
126126
[
127127
$($flags)*
128-
const $flag = libc::$flag,
128+
const $flag = libc::$flag;
129129
];
130130
}
131131
};
@@ -141,7 +141,7 @@ macro_rules! libc_bitflags {
141141
$prefix,
142142
[
143143
$($flags)*
144-
const $flag = libc::$flag,
144+
const $flag = libc::$flag;
145145
];
146146
$($tail)*
147147
}

0 commit comments

Comments
 (0)