Merge pull request #35 from lucab/ups/cargo-update-users

cargo: update users to 0.8

Cargo.toml

@@ -6,14 +6,16 @@ license = "Apache-2.0"
 repository = "https://github.com/coreos/update-ssh-keys"
 documentation = "https://docs.rs/update-ssh-keys"
 description = "A tool for managing authorized SSH keys"
-version = "0.3.1-alpha.0"
+version = "0.4.0-alpha.0"
 
 [dependencies]
+# Private dependencies.
 clap = "2.26"
-error-chain = { version = "0.12", default-features = false }
 fs2 = "0.4"
+# Public dependencies, exposed through library API.
+error-chain = { version = "0.12", default-features = false }
 openssh-keys = "0.3"
-users = "0.7"
+users = "0.8"
 
 [[bin]]
 name = "update-ssh-keys"

src/main.rs

@@ -140,13 +140,14 @@ fn run() -> Result<()> {
 }
 
 fn config() -> Result<Config> {
- // get the default user by figuring out the current user if the current user
- // is root (or doesn't exist) then use core
+ // get the default user by figuring out the current user; if the current user
+ // is root (or doesn't exist) then use 'core'.
  let default_user = get_current_username().map_or("core".into(), |u| {
- if u == "root" {
+ let name = u.to_string_lossy();
+ if name == "root" {
  "core".into()
  } else {
- u
+ name.into_owned()
  }
  });