diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/bitflags.rs | 41 | ||||
| -rw-r--r-- | src/libstd/io/fs.rs | 66 | ||||
| -rw-r--r-- | src/libstd/io/mod.rs | 110 | ||||
| -rw-r--r-- | src/libstd/io/tempfile.rs | 2 |
4 files changed, 136 insertions, 83 deletions
diff --git a/src/libstd/bitflags.rs b/src/libstd/bitflags.rs index 391d099de87..7966040ed7b 100644 --- a/src/libstd/bitflags.rs +++ b/src/libstd/bitflags.rs @@ -24,22 +24,22 @@ /// ```{.rust} /// bitflags! { /// flags Flags: u32 { -/// static FlagA = 0x00000001, -/// static FlagB = 0x00000010, -/// static FlagC = 0x00000100, -/// static FlagABC = FlagA.bits -/// | FlagB.bits -/// | FlagC.bits, +/// static FLAG_A = 0x00000001, +/// static FLAG_B = 0x00000010, +/// static FLAG_C = 0x00000100, +/// static FLAG_ABC = FLAG_A.bits +/// | FLAG_B.bits +/// | FLAG_C.bits, /// } /// } /// /// fn main() { -/// let e1 = FlagA | FlagC; -/// let e2 = FlagB | FlagC; -/// assert!((e1 | e2) == FlagABC); // union -/// assert!((e1 & e2) == FlagC); // intersection -/// assert!((e1 - e2) == FlagA); // set difference -/// assert!(!e2 == FlagA); // set complement +/// let e1 = FLAG_A | FLAG_C; +/// let e2 = FLAG_B | FLAG_C; +/// assert!((e1 | e2) == FLAG_ABC); // union +/// assert!((e1 & e2) == FLAG_C); // intersection +/// assert!((e1 - e2) == FLAG_A); // set difference +/// assert!(!e2 == FLAG_A); // set complement /// } /// ``` /// @@ -50,8 +50,8 @@ /// /// bitflags! { /// flags Flags: u32 { -/// static FlagA = 0x00000001, -/// static FlagB = 0x00000010, +/// static FLAG_A = 0x00000001, +/// static FLAG_B = 0x00000010, /// } /// } /// @@ -69,7 +69,7 @@ /// } /// /// fn main() { -/// let mut flags = FlagA | FlagB; +/// let mut flags = FLAG_A | FLAG_B; /// flags.clear(); /// assert!(flags.is_empty()); /// assert_eq!(format!("{}", flags).as_slice(), "hi!"); @@ -123,10 +123,7 @@ macro_rules! bitflags { bits: $T, } - $( - #[allow(non_uppercase_statics)] - $(#[$Flag_attr])* pub static $Flag: $BitFlags = $BitFlags { bits: $value }; - )+ + $($(#[$Flag_attr])* pub static $Flag: $BitFlags = $BitFlags { bits: $value };)+ impl $BitFlags { /// Returns an empty set of flags. @@ -243,16 +240,14 @@ macro_rules! bitflags { bitflags! { $(#[$attr])* flags $BitFlags: $T { - $( - #[allow(non_uppercase_statics)] - $(#[$Flag_attr])* static $Flag = $value - ),+ + $($(#[$Flag_attr])* static $Flag = $value),+ } } }; } #[cfg(test)] +#[allow(non_uppercase_statics)] mod tests { use hash; use option::{Some, None}; diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs index f777460e66a..24cc53e784e 100644 --- a/src/libstd/io/fs.rs +++ b/src/libstd/io/fs.rs @@ -295,9 +295,9 @@ pub fn unlink(path: &Path) -> IoResult<()> { Ok(stat) => stat, Err(..) => return Err(e), }; - if stat.perm.intersects(io::UserWrite) { return Err(e) } + if stat.perm.intersects(io::USER_WRITE) { return Err(e) } - match chmod(path, stat.perm | io::UserWrite) { + match chmod(path, stat.perm | io::USER_WRITE) { Ok(()) => do_unlink(path), Err(..) => { // Try to put it back as we found it @@ -501,10 +501,10 @@ pub fn copy(from: &Path, to: &Path) -> IoResult<()> { /// use std::io; /// use std::io::fs; /// -/// fs::chmod(&Path::new("file.txt"), io::UserFile); -/// fs::chmod(&Path::new("file.txt"), io::UserRead | io::UserWrite); -/// fs::chmod(&Path::new("dir"), io::UserDir); -/// fs::chmod(&Path::new("file.exe"), io::UserExec); +/// fs::chmod(&Path::new("file.txt"), io::USER_FILE); +/// fs::chmod(&Path::new("file.txt"), io::USER_READ | io::USER_WRITE); +/// fs::chmod(&Path::new("dir"), io::USER_DIR); +/// fs::chmod(&Path::new("file.exe"), io::USER_EXEC); /// ``` /// /// # Error @@ -578,7 +578,7 @@ pub fn readlink(path: &Path) -> IoResult<Path> { /// use std::io::fs; /// /// let p = Path::new("/some/dir"); -/// fs::mkdir(&p, io::UserRWX); +/// fs::mkdir(&p, io::USER_RWX); /// ``` /// /// # Error @@ -996,7 +996,7 @@ mod test { use os; use rand; let ret = os::tmpdir().join(format!("rust-{}", rand::random::<u32>())); - check!(io::fs::mkdir(&ret, io::UserRWX)); + check!(io::fs::mkdir(&ret, io::USER_RWX)); TempDir(ret) } @@ -1180,7 +1180,7 @@ mod test { fn file_test_stat_is_correct_on_is_dir() { let tmpdir = tmpdir(); let filename = &tmpdir.join("file_stat_correct_on_is_dir"); - check!(mkdir(filename, io::UserRWX)); + check!(mkdir(filename, io::USER_RWX)); let stat_res_fn = check!(stat(filename)); assert!(stat_res_fn.kind == io::TypeDirectory); let stat_res_meth = check!(filename.stat()); @@ -1192,7 +1192,7 @@ mod test { fn file_test_fileinfo_false_when_checking_is_file_on_a_directory() { let tmpdir = tmpdir(); let dir = &tmpdir.join("fileinfo_false_on_dir"); - check!(mkdir(dir, io::UserRWX)); + check!(mkdir(dir, io::USER_RWX)); assert!(dir.is_file() == false); check!(rmdir(dir)); } @@ -1212,7 +1212,7 @@ mod test { let tmpdir = tmpdir(); let dir = &tmpdir.join("before_and_after_dir"); assert!(!dir.exists()); - check!(mkdir(dir, io::UserRWX)); + check!(mkdir(dir, io::USER_RWX)); assert!(dir.exists()); assert!(dir.is_dir()); check!(rmdir(dir)); @@ -1224,7 +1224,7 @@ mod test { use str; let tmpdir = tmpdir(); let dir = &tmpdir.join("di_readdir"); - check!(mkdir(dir, io::UserRWX)); + check!(mkdir(dir, io::USER_RWX)); let prefix = "foo"; for n in range(0i,3) { let f = dir.join(format!("{}.txt", n)); @@ -1255,14 +1255,14 @@ mod test { fn file_test_walk_dir() { let tmpdir = tmpdir(); let dir = &tmpdir.join("walk_dir"); - check!(mkdir(dir, io::UserRWX)); + check!(mkdir(dir, io::USER_RWX)); let dir1 = &dir.join("01/02/03"); - check!(mkdir_recursive(dir1, io::UserRWX)); + check!(mkdir_recursive(dir1, io::USER_RWX)); check!(File::create(&dir1.join("04"))); let dir2 = &dir.join("11/12/13"); - check!(mkdir_recursive(dir2, io::UserRWX)); + check!(mkdir_recursive(dir2, io::USER_RWX)); check!(File::create(&dir2.join("14"))); let mut files = check!(walk_dir(dir)); @@ -1282,7 +1282,7 @@ mod test { fn recursive_mkdir() { let tmpdir = tmpdir(); let dir = tmpdir.join("d1/d2"); - check!(mkdir_recursive(&dir, io::UserRWX)); + check!(mkdir_recursive(&dir, io::USER_RWX)); assert!(dir.is_dir()) } @@ -1292,10 +1292,10 @@ mod test { let dir = tmpdir.join("d1"); let file = dir.join("f1"); - check!(mkdir_recursive(&dir, io::UserRWX)); + check!(mkdir_recursive(&dir, io::USER_RWX)); check!(File::create(&file)); - let result = mkdir_recursive(&file, io::UserRWX); + let result = mkdir_recursive(&file, io::USER_RWX); error!(result, "couldn't recursively mkdir"); error!(result, "couldn't create directory"); @@ -1305,7 +1305,7 @@ mod test { #[test] fn recursive_mkdir_slash() { - check!(mkdir_recursive(&Path::new("/"), io::UserRWX)); + check!(mkdir_recursive(&Path::new("/"), io::USER_RWX)); } // FIXME(#12795) depends on lstat to work on windows @@ -1318,8 +1318,8 @@ mod test { let dtt = dt.join("t"); let d2 = tmpdir.join("d2"); let canary = d2.join("do_not_delete"); - check!(mkdir_recursive(&dtt, io::UserRWX)); - check!(mkdir_recursive(&d2, io::UserRWX)); + check!(mkdir_recursive(&dtt, io::USER_RWX)); + check!(mkdir_recursive(&d2, io::USER_RWX)); check!(File::create(&canary).write(b"foo")); check!(symlink(&d2, &dt.join("d2"))); check!(rmdir_recursive(&d1)); @@ -1337,7 +1337,7 @@ mod test { let mut dirpath = tmpdir.path().clone(); dirpath.push(format!("test-가一ー你好")); - check!(mkdir(&dirpath, io::UserRWX)); + check!(mkdir(&dirpath, io::USER_RWX)); assert!(dirpath.is_dir()); let mut filepath = dirpath; @@ -1355,7 +1355,7 @@ mod test { let tmpdir = tmpdir(); let unicode = tmpdir.path(); let unicode = unicode.join(format!("test-각丁ー再见")); - check!(mkdir(&unicode, io::UserRWX)); + check!(mkdir(&unicode, io::USER_RWX)); assert!(unicode.exists()); assert!(!Path::new("test/unicode-bogus-path-각丁ー再见").exists()); } @@ -1436,12 +1436,12 @@ mod test { let out = tmpdir.join("out.txt"); check!(File::create(&input)); - check!(chmod(&input, io::UserRead)); + check!(chmod(&input, io::USER_READ)); check!(copy(&input, &out)); - assert!(!check!(out.stat()).perm.intersects(io::UserWrite)); + assert!(!check!(out.stat()).perm.intersects(io::USER_WRITE)); - check!(chmod(&input, io::UserFile)); - check!(chmod(&out, io::UserFile)); + check!(chmod(&input, io::USER_FILE)); + check!(chmod(&out, io::USER_FILE)); } #[cfg(not(windows))] // FIXME(#10264) operation not permitted? @@ -1517,16 +1517,16 @@ mod test { let file = tmpdir.join("in.txt"); check!(File::create(&file)); - assert!(check!(stat(&file)).perm.contains(io::UserWrite)); - check!(chmod(&file, io::UserRead)); - assert!(!check!(stat(&file)).perm.contains(io::UserWrite)); + assert!(check!(stat(&file)).perm.contains(io::USER_WRITE)); + check!(chmod(&file, io::USER_READ)); + assert!(!check!(stat(&file)).perm.contains(io::USER_WRITE)); - match chmod(&tmpdir.join("foo"), io::UserRWX) { + match chmod(&tmpdir.join("foo"), io::USER_RWX) { Ok(..) => fail!("wanted a failure"), Err(..) => {} } - check!(chmod(&file, io::UserFile)); + check!(chmod(&file, io::USER_FILE)); } #[test] @@ -1677,7 +1677,7 @@ mod test { let tmpdir = tmpdir(); let path = tmpdir.join("file"); check!(File::create(&path)); - check!(chmod(&path, io::UserRead)); + check!(chmod(&path, io::USER_READ)); check!(unlink(&path)); } } diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index c645e5240b8..e52a67cc32f 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1803,35 +1803,93 @@ 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, - static UserExecute = 0o100, - static GroupRead = 0o040, - static GroupWrite = 0o020, - static GroupExecute = 0o010, - static OtherRead = 0o004, - static OtherWrite = 0o002, - static OtherExecute = 0o001, - - static UserRWX = UserRead.bits | UserWrite.bits | UserExecute.bits, - static GroupRWX = GroupRead.bits | GroupWrite.bits | GroupExecute.bits, - static OtherRWX = OtherRead.bits | OtherWrite.bits | OtherExecute.bits, + static USER_READ = 0o400, + static USER_WRITE = 0o200, + static USER_EXECUTE = 0o100, + static GROUP_READ = 0o040, + static GROUP_WRITE = 0o020, + static GROUP_EXECUTE = 0o010, + static OTHER_READ = 0o004, + static OTHER_WRITE = 0o002, + static OTHER_EXECUTE = 0o001, + + static USER_RWX = USER_READ.bits | USER_WRITE.bits | USER_EXECUTE.bits, + static GROUP_RWX = GROUP_READ.bits | GROUP_WRITE.bits | GROUP_EXECUTE.bits, + static OTHER_RWX = OTHER_READ.bits | OTHER_WRITE.bits | OTHER_EXECUTE.bits, #[doc = "Permissions for user owned files, equivalent to 0644 on"] #[doc = "unix-like systems."] - static UserFile = UserRead.bits | UserWrite.bits | GroupRead.bits | OtherRead.bits, + static USER_FILE = USER_READ.bits | USER_WRITE.bits | GROUP_READ.bits | OTHER_READ.bits, #[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, + static USER_DIR = USER_RWX.bits | GROUP_READ.bits | GROUP_EXECUTE.bits | + OTHER_READ.bits | OTHER_EXECUTE.bits, #[doc = "Permissions for user owned executables, equivalent to 0755"] #[doc = "on unix-like systems."] - static UserExec = UserDir.bits, + static USER_EXEC = USER_DIR.bits, #[doc = "All possible permissions enabled."] - static AllPermissions = UserRWX.bits | GroupRWX.bits | OtherRWX.bits, + static ALL_PERMISSIONS = USER_RWX.bits | GROUP_RWX.bits | OTHER_RWX.bits, + + // Deprecated names + #[allow(non_uppercase_statics)] + #[deprecated = "use USER_READ instead"] + static UserRead = USER_READ.bits, + #[allow(non_uppercase_statics)] + #[deprecated = "use USER_WRITE instead"] + static UserWrite = USER_WRITE.bits, + #[allow(non_uppercase_statics)] + #[deprecated = "use USER_EXECUTE instead"] + static UserExecute = USER_EXECUTE.bits, + #[allow(non_uppercase_statics)] + #[deprecated = "use GROUP_READ instead"] + static GroupRead = GROUP_READ.bits, + #[allow(non_uppercase_statics)] + #[deprecated = "use GROUP_WRITE instead"] + static GroupWrite = GROUP_WRITE.bits, + #[allow(non_uppercase_statics)] + #[deprecated = "use GROUP_EXECUTE instead"] + static GroupExecute = GROUP_EXECUTE.bits, + #[allow(non_uppercase_statics)] + #[deprecated = "use OTHER_READ instead"] + static OtherRead = OTHER_READ.bits, + #[allow(non_uppercase_statics)] + #[deprecated = "use OTHER_WRITE instead"] + static OtherWrite = OTHER_WRITE.bits, + #[allow(non_uppercase_statics)] + #[deprecated = "use OTHER_EXECUTE instead"] + static OtherExecute = OTHER_EXECUTE.bits, + + #[allow(non_uppercase_statics)] + #[deprecated = "use USER_RWX instead"] + static UserRWX = USER_RWX.bits, + #[allow(non_uppercase_statics)] + #[deprecated = "use GROUP_RWX instead"] + static GroupRWX = GROUP_RWX.bits, + #[allow(non_uppercase_statics)] + #[deprecated = "use OTHER_RWX instead"] + static OtherRWX = OTHER_RWX.bits, + + #[doc = "Deprecated: use `USER_FILE` instead."] + #[allow(non_uppercase_statics)] + #[deprecated = "use USER_FILE instead"] + static UserFile = USER_FILE.bits, + + #[doc = "Deprecated: use `USER_DIR` instead."] + #[allow(non_uppercase_statics)] + #[deprecated = "use USER_DIR instead"] + static UserDir = USER_DIR.bits, + #[doc = "Deprecated: use `USER_EXEC` instead."] + #[allow(non_uppercase_statics)] + #[deprecated = "use USER_EXEC instead"] + static UserExec = USER_EXEC.bits, + + #[doc = "Deprecated: use `ALL_PERMISSIONS` instead"] + #[allow(non_uppercase_statics)] + #[deprecated = "use ALL_PERMISSIONS instead"] + static AllPermissions = ALL_PERMISSIONS.bits, } } @@ -1954,13 +2012,13 @@ mod tests { fn test_show() { use super::*; - assert_eq!(format!("{}", UserRead), "0400".to_string()); - assert_eq!(format!("{}", UserFile), "0644".to_string()); - assert_eq!(format!("{}", UserExec), "0755".to_string()); - assert_eq!(format!("{}", UserRWX), "0700".to_string()); - assert_eq!(format!("{}", GroupRWX), "0070".to_string()); - assert_eq!(format!("{}", OtherRWX), "0007".to_string()); - assert_eq!(format!("{}", AllPermissions), "0777".to_string()); - assert_eq!(format!("{}", UserRead | UserWrite | OtherWrite), "0602".to_string()); + assert_eq!(format!("{}", USER_READ), "0400".to_string()); + assert_eq!(format!("{}", USER_FILE), "0644".to_string()); + assert_eq!(format!("{}", USER_EXEC), "0755".to_string()); + assert_eq!(format!("{}", USER_RWX), "0700".to_string()); + assert_eq!(format!("{}", GROUP_RWX), "0070".to_string()); + assert_eq!(format!("{}", OTHER_RWX), "0007".to_string()); + assert_eq!(format!("{}", ALL_PERMISSIONS), "0777".to_string()); + assert_eq!(format!("{}", USER_READ | USER_WRITE | OTHER_WRITE), "0602".to_string()); } } diff --git a/src/libstd/io/tempfile.rs b/src/libstd/io/tempfile.rs index 9d6713b25b7..1d8aedb172b 100644 --- a/src/libstd/io/tempfile.rs +++ b/src/libstd/io/tempfile.rs @@ -48,7 +48,7 @@ impl TempDir { unsafe { CNT.fetch_add(1, atomic::SeqCst) }, suffix); let p = tmpdir.join(filename); - match fs::mkdir(&p, io::UserRWX) { + match fs::mkdir(&p, io::USER_RWX) { Err(error) => { if attempts >= 1000 { return Err(error) |