diff options
| author | bors <bors@rust-lang.org> | 2014-09-04 20:21:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-09-04 20:21:02 +0000 |
| commit | e024017f60c93b6ff4f37bd4bd580f30deafb107 (patch) | |
| tree | 7df072df6ef8016b7644340a12138dd5567a7607 /src/libstd/io | |
| parent | d3e7922ddd5f2abfa4d5139e8bca5fab3e796f33 (diff) | |
| parent | ef354d850e516e7005da050f0b5b8d3a5c2d7f45 (diff) | |
| download | rust-e024017f60c93b6ff4f37bd4bd580f30deafb107.tar.gz rust-e024017f60c93b6ff4f37bd4bd580f30deafb107.zip | |
auto merge of #16986 : bjz/rust/bitflags, r=alexcrichton
Closes #16469
Diffstat (limited to 'src/libstd/io')
| -rw-r--r-- | src/libstd/io/mod.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 693a65b442d..e2de8becb34 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1794,9 +1794,9 @@ pub struct UnstableFileStat { pub gen: u64, } -bitflags!( - #[doc="A set of permissions for a file or directory is represented -by a set of flags which are or'd together."] +bitflags! { + #[doc = "A set of permissions for a file or directory is represented"] + #[doc = "by a set of flags which are or'd together."] flags FilePermission: u32 { static UserRead = 0o400, static UserWrite = 0o200, @@ -1812,23 +1812,23 @@ by a set of flags which are or'd together."] static GroupRWX = GroupRead.bits | GroupWrite.bits | GroupExecute.bits, static OtherRWX = OtherRead.bits | OtherWrite.bits | OtherExecute.bits, - #[doc="Permissions for user owned files, equivalent to 0644 on -unix-like systems."] + #[doc = "Permissions for user owned files, equivalent to 0644 on"] + #[doc = "unix-like systems."] static UserFile = UserRead.bits | UserWrite.bits | GroupRead.bits | OtherRead.bits, - #[doc="Permissions for user owned directories, equivalent to 0755 on -unix-like systems."] + #[doc = "Permissions for user owned directories, equivalent to 0755 on"] + #[doc = "unix-like systems."] static UserDir = UserRWX.bits | GroupRead.bits | GroupExecute.bits | OtherRead.bits | OtherExecute.bits, - #[doc="Permissions for user owned executables, equivalent to 0755 -on unix-like systems."] + #[doc = "Permissions for user owned executables, equivalent to 0755"] + #[doc = "on unix-like systems."] static UserExec = UserDir.bits, - #[doc="All possible permissions enabled."] - static AllPermissions = UserRWX.bits | GroupRWX.bits | OtherRWX.bits + #[doc = "All possible permissions enabled."] + static AllPermissions = UserRWX.bits | GroupRWX.bits | OtherRWX.bits, } -) +} impl Default for FilePermission { #[inline] |