diff options
author | Lars Wirzenius <liw@liw.fi> | 2018-10-07 13:09:41 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2018-10-07 13:09:41 +0300 |
commit | ed84c949af762cab30fd909d9998b16d99332c9b (patch) | |
tree | d6e12c539444611510ad401ae04552db03524996 /src | |
parent | dfae8f13aca85358ff05f0048163a6379e11c1f8 (diff) | |
download | summainrs-ed84c949af762cab30fd909d9998b16d99332c9b.tar.gz |
Refactor: rename to_value to str_value, for clarity
Diffstat (limited to 'src')
-rw-r--r-- | src/format.rs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/format.rs b/src/format.rs index 38cb9c7..13192a2 100644 --- a/src/format.rs +++ b/src/format.rs @@ -14,7 +14,7 @@ use crypto_hash::{Algorithm, Hasher}; use serde_yaml; -fn to_value(s: &str) -> serde_yaml::Value { +fn str_value(s: &str) -> serde_yaml::Value { serde_yaml::to_value(s).unwrap() } @@ -25,7 +25,7 @@ fn int_value(i: u64) -> serde_yaml::Value { pub fn name(e: &DirEntry) -> serde_yaml::Value { - to_value(&e.path().to_string_lossy()) + str_value(&e.path().to_string_lossy()) } @@ -34,14 +34,14 @@ pub fn mtime(e: &DirEntry) -> serde_yaml::Value { let mtime = meta.modified().unwrap(); let datetime = DateTime::<Utc>::from(mtime); let mtime = datetime.format("%Y-%m-%d %H:%M:%S.%f %z").to_string(); - to_value(&mtime) + str_value(&mtime) } pub fn mode(e: &DirEntry) -> serde_yaml::Value { let meta = e.metadata().unwrap(); let mode = meta.permissions().mode(); - to_value(&mode.to_string()) + int_value(mode as u64) } @@ -84,9 +84,9 @@ pub fn gid(e: &DirEntry) -> serde_yaml::Value { pub fn username(e: &DirEntry) -> serde_yaml::Value { let meta = e.metadata().unwrap(); if let Some(u) = users::get_user_by_uid(meta.st_uid()) { - to_value(u.name()) + str_value(u.name()) } else { - to_value("unknown user") + str_value("unknown user") } } @@ -94,9 +94,9 @@ pub fn username(e: &DirEntry) -> serde_yaml::Value { pub fn group(e: &DirEntry) -> serde_yaml::Value { let meta = e.metadata().unwrap(); if let Some(g) = users::get_group_by_gid(meta.st_gid()) { - to_value(g.name()) + str_value(g.name()) } else { - to_value("unknown group") + str_value("unknown group") } } @@ -124,8 +124,8 @@ pub fn sha256(e: &DirEntry) -> serde_yaml::Value { } if ok { let digest = hasher.finish(); - to_value(&hex::encode(digest)) + str_value(&hex::encode(digest)) } else { - to_value("can't read file") + str_value("can't read file") } } |