From 8617a4a919707080b962c1df8456765956495eaa Mon Sep 17 00:00:00 2001 From: Titouan Rigoudy Date: Tue, 12 Apr 2016 16:40:20 +0200 Subject: [PATCH] Remove dependency on control module in user module. --- src/client.rs | 2 +- src/user.rs | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/client.rs b/src/client.rs index 52d8850..2ada100 100644 --- a/src/client.rs +++ b/src/client.rs @@ -311,7 +311,7 @@ impl Client { fn handle_privileged_users_response( &mut self, response: PrivilegedUsersResponse) { - self.users.update_privileges(response); + self.users.set_all_privileged(response.users); } fn handle_room_list_response(&mut self, response: RoomListResponse) { diff --git a/src/user.rs b/src/user.rs index 4bff9db..d6bc398 100644 --- a/src/user.rs +++ b/src/user.rs @@ -1,6 +1,5 @@ use std::collections; -use proto::server; use result; const STATUS_OFFLINE: u32 = 1; @@ -91,12 +90,11 @@ impl UserMap { self.map.insert(name, user); } - /// Update the set of privileged users based on the last server response. - pub fn update_privileges( - &mut self, mut response: server::PrivilegedUsersResponse) + /// Sets the set of privileged users to the given list. + pub fn set_all_privileged(&mut self, mut users: Vec) { self.privileged.clear(); - for name in response.users.drain(..) { + for name in users.drain(..) { self.privileged.insert(name); } }