rename User from Client

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/server/server.rs b/server/server.rs
index c15db88a81e5dd9b7b22444c79284ad7da9f5976..5da413c501157e38a3158f46c359da087798fd95 100644 (file)
--- a/server/server.rs
+++ b/server/server.rs
@@ -9,7 +9,7 @@ mod slocal;
 mod sweb;
 
 pub use sweb::{WebRequest, WebResponse};
-pub use suser::Client;
+pub use suser::User;
 
 #[derive(StructOpt,Debug)]
 pub struct Opts {
@@ -26,7 +26,7 @@ pub const INTERNAL_QUEUE: usize = 15; // xxx: config
 #[derive(Debug)]
 pub struct Global {
   config: config::InstanceConfigGlobal,
-  all_clients: HashMap<ClientName, Client>,
+  all_clients: HashMap<ClientName, User>,
 }
 
 pub type RoutedPacket = Box<[u8]>; // not MIME data
@@ -98,7 +98,7 @@ async fn main() {
       client_handles_send,
     ).map(|(ic, (web_send, route_send))| {
       (ic.link.client,
-       Client {
+       User {
          ic: ic.clone(),
          web: web_send,
          route: route_send,

diff --git a/server/suser.rs b/server/suser.rs
index d24638471fb884f006338e05ccbd3e7a5f9afca3..acae5dcd35ab8676b8371c96de0283a626566303 100644 (file)
--- a/server/suser.rs
+++ b/server/suser.rs
@@ -5,7 +5,7 @@
 use super::*;
 
 #[derive(Debug)]
-pub struct Client {
+pub struct User {
   pub ic: Arc<InstanceConfig>,
   pub web: mpsc::Sender<WebRequest>,
   pub route: mpsc::Sender<RoutedPacket>,