about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorJonas Hietala <tradet.h@gmail.com>2014-09-04 09:01:51 +0200
committerJonas Hietala <tradet.h@gmail.com>2014-09-04 09:01:51 +0200
commit38bf999f4a5337022211c9b990fcb7dfe0bccf32 (patch)
tree6deab8e01317ee0e7cb9ed1989915e88cd938114 /src/libstd
parentfca8a1d1510e8a526981eadd3c3fd221b501e6d6 (diff)
downloadrust-38bf999f4a5337022211c9b990fcb7dfe0bccf32.tar.gz
rust-38bf999f4a5337022211c9b990fcb7dfe0bccf32.zip
Print file permissions with 4 digits.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/io/fs.rs2
-rw-r--r--src/libstd/io/mod.rs18
2 files changed, 10 insertions, 10 deletions
diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs
index 1313bf5c105..3d6bb96063e 100644
--- a/src/libstd/io/fs.rs
+++ b/src/libstd/io/fs.rs
@@ -1274,7 +1274,7 @@ mod test {
 
         error!(result, "couldn't recursively mkdir");
         error!(result, "couldn't create directory");
-        error!(result, "mode=700");
+        error!(result, "mode=0700");
         error!(result, format!("path={}", file.display()));
     })
 
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index cc51ac8e3ba..c7996c549f4 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -1838,7 +1838,7 @@ impl Default for FilePermission {
 impl fmt::Show for FilePermission {
     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         formatter.fill = '0';
-        formatter.width = Some(3);
+        formatter.width = Some(4);
         (&self.bits as &fmt::Octal).fmt(formatter)
     }
 }
@@ -1949,13 +1949,13 @@ mod tests {
     fn test_show() {
         use super::*;
 
-        assert_eq!(format!("{}", UserRead), "400".to_string());
-        assert_eq!(format!("{}", UserFile), "644".to_string());
-        assert_eq!(format!("{}", UserExec), "755".to_string());
-        assert_eq!(format!("{}", UserRWX),  "700".to_string());
-        assert_eq!(format!("{}", GroupRWX), "070".to_string());
-        assert_eq!(format!("{}", OtherRWX), "007".to_string());
-        assert_eq!(format!("{}", AllPermissions), "777".to_string());
-        assert_eq!(format!("{}", UserRead | UserWrite | OtherWrite), "602".to_string());
+        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());
     }
 }