Jelajahi Sumber

Merge pull request #150 from gierens/move-to-uzers

Migrate from users lib to uzers
Christina Sørensen 2 tahun lalu
induk
melakukan
a1ca9cd54c
5 mengubah file dengan 15 tambahan dan 15 penghapusan
  1. 4 4
      Cargo.lock
  2. 2 2
      Cargo.toml
  3. 5 5
      src/output/render/groups.rs
  4. 3 3
      src/output/render/users.rs
  5. 1 1
      src/output/table.rs

+ 4 - 4
Cargo.lock

@@ -71,7 +71,7 @@ dependencies = [
  "terminal_size",
  "timeago",
  "unicode-width",
- "users",
+ "uzers",
  "zoneinfo_compiled",
 ]
 
@@ -344,10 +344,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "users"
-version = "0.11.0"
+name = "uzers"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032"
+checksum = "76f77f08efdd6dfbf13363b13db3649431d35d682f1c074edc476a04afaba466"
 dependencies = [
  "libc",
  "log",

+ 2 - 2
Cargo.toml

@@ -17,7 +17,7 @@ version = "0.10.8"
 license-file = [ "LICENCE", "4" ]
 depends = "$auto"
 extended-description = """
-eza is a modern, maintained replacement for ls 
+eza is a modern, maintained replacement for ls
 """
 section = "utils"
 priority = "optional"
@@ -63,7 +63,7 @@ optional = true
 default-features = false
 
 [target.'cfg(unix)'.dependencies]
-users = "0.11"
+uzers = "0.11.1"
 
 [build-dependencies.datetime]
 version = "0.5.2"

+ 5 - 5
src/output/render/groups.rs

@@ -1,5 +1,5 @@
 use ansi_term::Style;
-use users::{Users, Groups};
+use uzers::{Users, Groups};
 
 use crate::fs::fields as f;
 use crate::output::cell::TextCell;
@@ -11,7 +11,7 @@ pub trait Render{
 
 impl Render for Option<f::Group> {
     fn render<C: Colours, U: Users+Groups>(self, colours: &C, users: &U, format: UserFormat) -> TextCell {
-        use users::os::unix::GroupExt;
+        use uzers::os::unix::GroupExt;
 
         let mut style = colours.not_yours();
 
@@ -59,9 +59,9 @@ pub mod test {
     use crate::output::cell::TextCell;
     use crate::output::table::UserFormat;
 
-    use users::{User, Group};
-    use users::mock::MockUsers;
-    use users::os::unix::GroupExt;
+    use uzers::{User, Group};
+    use uzers::mock::MockUsers;
+    use uzers::os::unix::GroupExt;
     use ansi_term::Colour::*;
     use ansi_term::Style;
 

+ 3 - 3
src/output/render/users.rs

@@ -1,5 +1,5 @@
 use ansi_term::Style;
-use users::Users;
+use uzers::Users;
 
 use crate::fs::fields as f;
 use crate::output::cell::TextCell;
@@ -43,8 +43,8 @@ pub mod test {
     use crate::output::cell::TextCell;
     use crate::output::table::UserFormat;
 
-    use users::User;
-    use users::mock::MockUsers;
+    use uzers::User;
+    use uzers::mock::MockUsers;
     use ansi_term::Colour::*;
     use ansi_term::Style;
 

+ 1 - 1
src/output/table.rs

@@ -10,7 +10,7 @@ use zoneinfo_compiled::{CompiledData, Result as TZResult};
 use lazy_static::lazy_static;
 use log::*;
 #[cfg(unix)]
-use users::UsersCache;
+use uzers::UsersCache;
 
 use crate::fs::{File, fields as f};
 use crate::fs::feature::git::GitCache;