diff --git a/common/Cargo.toml b/common/Cargo.toml index f5cc59a..15c1932 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -13,7 +13,7 @@ log = { version = "0.4" } thiserror = { version = "1.0" } serde_yaml = { version = "0.9" } lazy_static = { version = "1.4" } -users = { version = "0.11" } +uzers = { version = "0.12" } rust-ini = { version = "0.21" } tempfile = { version = "3.4" } diff --git a/common/src/container.rs b/common/src/container.rs index e23f87f..7633ef7 100644 --- a/common/src/container.rs +++ b/common/src/container.rs @@ -28,7 +28,7 @@ use crate::flakelog::FlakeLog; use crate::error::FlakeError; use crate::user::User; use crate::command::CommandExtTrait; -use users::{get_current_uid, get_current_gid}; +use uzers::{get_current_uid, get_current_gid}; #[derive(Debug, Default, Clone, Copy)] pub struct Container { diff --git a/common/src/user.rs b/common/src/user.rs index efbe2d1..816b341 100644 --- a/common/src/user.rs +++ b/common/src/user.rs @@ -26,7 +26,7 @@ use std::path::Path; use std::{process::Command, ffi::OsStr}; use serde::{Serialize, Deserialize}; use crate::command::{CommandExtTrait, CommandError}; -use users::{get_current_uid, get_current_groupname}; +use uzers::{get_current_uid, get_current_groupname}; #[derive(Debug, Default, Clone, Copy, Serialize, Deserialize)] pub struct User<'a> { diff --git a/flake-ctl/Cargo.toml b/flake-ctl/Cargo.toml index 3d28ad4..9657a42 100644 --- a/flake-ctl/Cargo.toml +++ b/flake-ctl/Cargo.toml @@ -18,4 +18,4 @@ indicatif = { version = "0.15" } tokio = { version = "1.32", features = ["full"] } tempfile = { version = "3.4" } flakes = { version = "3.1.18", path = "../common" } -users = { version = "0.11" } +uzers = { version = "0.12" } diff --git a/flake-ctl/src/fetch.rs b/flake-ctl/src/fetch.rs index 067c71e..c1ff6d6 100644 --- a/flake-ctl/src/fetch.rs +++ b/flake-ctl/src/fetch.rs @@ -100,7 +100,7 @@ pub async fn send_request( let request_status = format!("{}", status); if request_status != "200 OK" { return Err( - Box::new(Error::new(ErrorKind::Other, request_status)) + Box::new(Error::other(request_status)) ) } }, diff --git a/flake-ctl/src/podman.rs b/flake-ctl/src/podman.rs index 0453589..c169ed3 100644 --- a/flake-ctl/src/podman.rs +++ b/flake-ctl/src/podman.rs @@ -31,7 +31,7 @@ use crate::defaults; use crate::{app, app_config}; use flakes::container::Container; use flakes::config::get_flakes_dir; -use users::{get_current_username}; +use uzers::{get_current_username}; pub fn pull(uri: &String) -> i32 { /*! diff --git a/podman-pilot/Cargo.toml b/podman-pilot/Cargo.toml index 16a41f6..ea6f93e 100644 --- a/podman-pilot/Cargo.toml +++ b/podman-pilot/Cargo.toml @@ -17,5 +17,5 @@ serde_yaml = { version = "0.9" } regex = { version = "1.9" } flakes = { version = "3.1.18", path = "../common" } rust-ini = { version = "0.21" } -users = { version = "0.11" } +uzers = { version = "0.12" } atty = { version = "0.2" } diff --git a/podman-pilot/src/podman.rs b/podman-pilot/src/podman.rs index a4b3224..059f125 100644 --- a/podman-pilot/src/podman.rs +++ b/podman-pilot/src/podman.rs @@ -49,7 +49,7 @@ use spinoff::{Spinner, spinners, Color}; use tempfile::tempfile; use regex::Regex; -use users::{get_current_username}; +use uzers::{get_current_username}; pub fn create( program_name: &String