Skip to content

Commit

Permalink
Merge pull request #150 from gierens/move-to-uzers
Browse files Browse the repository at this point in the history
Migrate from users lib to uzers
  • Loading branch information
cafkafk authored Aug 22, 2023
2 parents 2e10554 + 6e59205 commit a1ca9cd
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions src/output/render/groups.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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();

Expand Down Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions src/output/render/users.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/output/table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit a1ca9cd

Please sign in to comment.