Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename Users::refresh_list and Groups::refresh_list into refresh #1411

Merged
merged 1 commit into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benches/basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,6 @@ fn bench_refresh_users_list(b: &mut test::Bencher) {
let mut users = sysinfo::Users::new_with_refreshed_list();

b.iter(move || {
users.refresh_list();
users.refresh();
});
}
2 changes: 1 addition & 1 deletion examples/simple.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ fn interpret_input(
}
"refresh_users" => {
writeln!(&mut io::stdout(), "Refreshing user list...");
users.refresh_list();
users.refresh();
writeln!(&mut io::stdout(), "Done.");
}
"refresh_networks" => {
Expand Down
24 changes: 11 additions & 13 deletions src/common/user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ impl Users {
/// use sysinfo::Users;
///
/// let mut users = Users::new();
/// users.refresh_list();
/// users.refresh();
/// for user in users.list() {
/// println!("{user:?}");
/// }
Expand All @@ -262,7 +262,6 @@ impl Users {
}

/// Creates a new [`Users`][crate::Users] type with the user list loaded.
/// It is a combination of [`Users::new`] and [`Users::refresh_list`].
///
/// ```no_run
/// use sysinfo::Users;
Expand All @@ -274,7 +273,7 @@ impl Users {
/// ```
pub fn new_with_refreshed_list() -> Self {
let mut users = Self::new();
users.refresh_list();
users.refresh();
users
}

Expand Down Expand Up @@ -312,9 +311,9 @@ impl Users {
/// use sysinfo::Users;
///
/// let mut users = Users::new();
/// users.refresh_list();
/// users.refresh();
/// ```
pub fn refresh_list(&mut self) {
pub fn refresh(&mut self) {
crate::sys::get_users(&mut self.users);
}

Expand Down Expand Up @@ -424,7 +423,7 @@ impl Groups {
/// use sysinfo::Groups;
///
/// let mut groups = Groups::new();
/// groups.refresh_list();
/// groups.refresh();
/// for group in groups.list() {
/// println!("{group:?}");
/// }
Expand All @@ -434,7 +433,6 @@ impl Groups {
}

/// Creates a new [`Groups`][crate::Groups] type with the user list loaded.
/// It is a combination of [`Groups::new`] and [`Groups::refresh_list`].
///
/// ```no_run
/// use sysinfo::Groups;
Expand All @@ -446,7 +444,7 @@ impl Groups {
/// ```
pub fn new_with_refreshed_list() -> Self {
let mut groups = Self::new();
groups.refresh_list();
groups.refresh();
groups
}

Expand Down Expand Up @@ -481,12 +479,12 @@ impl Groups {
/// The group list will be emptied then completely recomputed.
///
/// ```no_run
/// use sysinfo::Users;
/// use sysinfo::Groups;
///
/// let mut users = Users::new();
/// users.refresh_list();
/// let mut groups = Groups::new();
/// groups.refresh();
/// ```
pub fn refresh_list(&mut self) {
pub fn refresh(&mut self) {
crate::sys::get_groups(&mut self.groups);
}
}
Expand All @@ -499,7 +497,7 @@ mod tests {
fn check_list() {
let mut users = Users::new();
assert!(users.list().is_empty());
users.refresh_list();
users.refresh();
assert!(users.list().len() >= MIN_USERS);
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ mod test {
fn check_uid_gid() {
let mut users = Users::new();
assert!(users.list().is_empty());
users.refresh_list();
users.refresh();
let user_list = users.list();
assert!(user_list.len() >= MIN_USERS);

Expand Down
2 changes: 1 addition & 1 deletion tests/users.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fn test_users() {
if sysinfo::IS_SUPPORTED_SYSTEM {
let mut users = Users::new();
assert_eq!(users.iter().count(), 0);
users.refresh_list();
users.refresh();
assert!(users.iter().count() > 0);
let count = users.first().unwrap().groups().iter().len();
for _ in 1..10 {
Expand Down
Loading