Merge #583

583: bump nix r=adamgreig a=Emilgardis Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com>
cross-rs · Aug 28, 2021 · 096c480 · 096c480
2 parents b8bcd07 + fca9f19
commit 096c480
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Added support for mounting volumes.
 - Re-enabled `powerpc64-unknown-linux-gnu` image
 - Re-enabled `sparc64-unknown-linux-gnu` image
+- Bump nix dependency to `0.22.1`
 
 ## [v0.2.1] - 2020-06-30
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ atty = "0.2"
 error-chain = "0.12"
 home = "0.5"
 lazy_static = "1.0"
-libc = "0.2.18"
+libc = "0.2.101"
 rustc_version = "0.2"
 semver = "0.9"
 toml = "0.5"
@@ -24,7 +24,7 @@ shell-escape = "0.1.4"
 serde_json = "1.0.48"
 
 [target.'cfg(not(windows))'.dependencies]
-nix = "0.15"
+nix = "0.22.1"
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3.7", features = ["winbase"] }

diff --git a/src/id.rs b/src/id.rs
@@ -64,7 +64,7 @@ pub fn username() -> Result<Option<String>, Error>  {
 
             if errno == 0 { return Ok(None) }
 
-            return Err(Error::Sys(Errno::from_i32(errno)))
+            return Err(Errno::from_i32(errno))
         }
 
         CStr::from_ptr((*passwd).pw_name)