Rename the `login` module to `user`.

6 files changed, 17 insertions, 17 deletions

diff --git a/src/test/fixtures/cookie.rs b/src/test/fixtures/cookie.rs
index fcb379f..bba53b8 100644
--- a/src/test/fixtures/cookie.rs
+++ b/src/test/fixtures/cookie.rs
@@ -3,9 +3,9 @@ use uuid::Uuid;
 use crate::{
     app::App,
     clock::RequestedAt,
-    login::Password,
     name::Name,
     token::{Secret, extract::IdentityCookie},
+    user::Password,
 };
 
 pub fn not_logged_in() -> IdentityCookie {
diff --git a/src/test/fixtures/event.rs b/src/test/fixtures/event.rs
index e11f6ee..c6e5337 100644
--- a/src/test/fixtures/event.rs
+++ b/src/test/fixtures/event.rs
@@ -68,8 +68,8 @@ pub mod message {
 pub mod login {
     use std::future::{self, Ready};
 
-    pub use crate::login::Event;
-    use crate::login::event;
+    pub use crate::user::Event;
+    use crate::user::event;
 
     pub fn created(event: Event) -> Ready<Option<event::Created>> {
         future::ready(match event {
diff --git a/src/test/fixtures/identity.rs b/src/test/fixtures/identity.rs
index ffc44c6..7611066 100644
--- a/src/test/fixtures/identity.rs
+++ b/src/test/fixtures/identity.rs
@@ -1,13 +1,13 @@
 use crate::{
     app::App,
     clock::RequestedAt,
-    login::Password,
     name::Name,
     test::fixtures,
     token::{
         self,
         extract::{Identity, IdentityCookie},
     },
+    user::Password,
 };
 
 pub async fn create(app: &App, created_at: &RequestedAt) -> Identity {
@@ -27,7 +27,7 @@ pub async fn from_cookie(
         .await
         .expect("always validates newly-issued secret");
 
-    Identity { token, login }
+    Identity { token, user: login }
 }
 
 pub async fn logged_in(
@@ -43,5 +43,5 @@ pub fn fictitious() -> Identity {
     let token = token::Id::generate();
     let login = fixtures::login::fictitious();
 
-    Identity { token, login }
+    Identity { token, user: login }
 }
diff --git a/src/test/fixtures/invite.rs b/src/test/fixtures/invite.rs
index 654d1b4..7a41eb6 100644
--- a/src/test/fixtures/invite.rs
+++ b/src/test/fixtures/invite.rs
@@ -2,10 +2,10 @@ use crate::{
     app::App,
     clock::DateTime,
     invite::{self, Invite},
-    login::Login,
+    user::User,
 };
 
-pub async fn issue(app: &App, issuer: &Login, issued_at: &DateTime) -> Invite {
+pub async fn issue(app: &App, issuer: &User, issued_at: &DateTime) -> Invite {
     app.invites()
         .issue(issuer, issued_at)
         .await
diff --git a/src/test/fixtures/login.rs b/src/test/fixtures/login.rs
index 86e3e39..e668c95 100644
--- a/src/test/fixtures/login.rs
+++ b/src/test/fixtures/login.rs
@@ -4,14 +4,14 @@ use uuid::Uuid;
 use crate::{
     app::App,
     clock::RequestedAt,
-    login::{self, Login, Password},
     name::Name,
+    user::{self, Password, User},
 };
 
 pub async fn create_with_password(app: &App, created_at: &RequestedAt) -> (Name, Password) {
     let (name, password) = propose();
     let login = app
-        .logins()
+        .users()
         .create(&name, &password, created_at)
         .await
         .expect("should always succeed if the login is actually new");
@@ -19,17 +19,17 @@ pub async fn create_with_password(app: &App, created_at: &RequestedAt) -> (Name,
     (login.name, password)
 }
 
-pub async fn create(app: &App, created_at: &RequestedAt) -> Login {
+pub async fn create(app: &App, created_at: &RequestedAt) -> User {
     let (name, password) = propose();
-    app.logins()
+    app.users()
         .create(&name, &password, created_at)
         .await
         .expect("should always succeed if the login is actually new")
 }
 
-pub fn fictitious() -> Login {
-    Login {
-        id: login::Id::generate(),
+pub fn fictitious() -> User {
+    User {
+        id: user::Id::generate(),
         name: propose_name(),
     }
 }
diff --git a/src/test/fixtures/message.rs b/src/test/fixtures/message.rs
index d3b4719..2254915 100644
--- a/src/test/fixtures/message.rs
+++ b/src/test/fixtures/message.rs
@@ -4,11 +4,11 @@ use crate::{
     app::App,
     channel::Channel,
     clock::RequestedAt,
-    login::Login,
     message::{self, Body, Message},
+    user::User,
 };
 
-pub async fn send(app: &App, channel: &Channel, sender: &Login, sent_at: &RequestedAt) -> Message {
+pub async fn send(app: &App, channel: &Channel, sender: &User, sent_at: &RequestedAt) -> Message {
     let body = propose();
 
     app.messages()