From b6cd8deb6f47041d2fe2d2f2cb48dcb0a90c7bf9 Mon Sep 17 00:00:00 2001 From: Alex Lyon Date: Wed, 1 May 2019 21:07:13 -0700 Subject: [PATCH] Switch users back to our rust-users fork to fix the build --- Cargo.lock | 20 ++++++++++---------- Cargo.toml | 3 ++- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0fb92c3ff..ae89e4184 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1347,6 +1347,14 @@ name = "rust-ini" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "rust-users" +version = "0.6.0" +source = "git+https://github.com/uutils/rust-users#e64253f2b995e7f1a458c68a7eca66e0171d183a" +dependencies = [ + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rustc-demangle" version = "0.1.14" @@ -1867,14 +1875,6 @@ dependencies = [ "uucore 0.0.1", ] -[[package]] -name = "users" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "utf8-ranges" version = "1.0.2" @@ -1968,6 +1968,7 @@ dependencies = [ "relpath 0.0.1", "rm 0.0.1", "rmdir 0.0.1", + "rust-users 0.6.0 (git+https://github.com/uutils/rust-users)", "seq 0.0.1", "shred 0.0.1", "shuf 0.0.1", @@ -1999,7 +2000,6 @@ dependencies = [ "unlink 0.0.1", "uptime 0.0.1", "users 0.0.1", - "users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "uucore 0.0.1", "wc 0.0.1", "who 0.0.1", @@ -2217,6 +2217,7 @@ dependencies = [ "checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96" "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" "checksum rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" +"checksum rust-users 0.6.0 (git+https://github.com/uutils/rust-users)" = "" "checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" "checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f" @@ -2252,7 +2253,6 @@ dependencies = [ "checksum unindent 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "834b4441326c660336850c5c0926cc20548e848967a5f57bc20c2b741c8d41f4" "checksum unix_socket 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6aa2700417c405c38f5e6902d699345241c28c0b7ade4abaad71e35a87eb1564" "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -"checksum users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf" "checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" diff --git a/Cargo.toml b/Cargo.toml index 37cc2b21e..c18c61562 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -263,7 +263,8 @@ unindent = "0.1.3" lazy_static = "1.3.0" [target.'cfg(unix)'.dev-dependencies] -rust-users = { version = "0.9", package = "users" } +# FIXME: this should use the normal users crate, but it conflicts with the users utility +rust-users = { git = "https://github.com/uutils/rust-users" } unix_socket = "0.5.0" [[bin]]