summaryrefslogtreecommitdiff
path: root/src/channel
diff options
context:
space:
mode:
Diffstat (limited to 'src/channel')
-rw-r--r--src/channel/app.rs5
-rw-r--r--src/channel/history.rs4
-rw-r--r--src/channel/repo.rs6
-rw-r--r--src/channel/routes/channel/post.rs2
-rw-r--r--src/channel/routes/mod.rs2
-rw-r--r--src/channel/routes/post.rs2
-rw-r--r--src/channel/snapshot.rs2
7 files changed, 12 insertions, 11 deletions
diff --git a/src/channel/app.rs b/src/channel/app.rs
index 1e341e3..dc9e584 100644
--- a/src/channel/app.rs
+++ b/src/channel/app.rs
@@ -3,13 +3,14 @@ use itertools::Itertools;
use sqlx::sqlite::SqlitePool;
use super::{
+ Channel, Id,
repo::{LoadError, Provider as _},
- validate, Channel, Id,
+ validate,
};
use crate::{
clock::DateTime,
db::{Duplicate as _, NotFound as _},
- event::{repo::Provider as _, Broadcaster, Event, Sequence},
+ event::{Broadcaster, Event, Sequence, repo::Provider as _},
message::{self, repo::Provider as _},
name::{self, Name},
};
diff --git a/src/channel/history.rs b/src/channel/history.rs
index ef2120d..4af46ce 100644
--- a/src/channel/history.rs
+++ b/src/channel/history.rs
@@ -1,8 +1,8 @@
use itertools::Itertools as _;
use super::{
- event::{Created, Deleted, Event},
Channel, Id,
+ event::{Created, Deleted, Event},
};
use crate::event::{Instant, Sequence};
@@ -42,7 +42,7 @@ impl History {
// Event factories
impl History {
- pub fn events(&self) -> impl Iterator<Item = Event> {
+ pub fn events(&self) -> impl Iterator<Item = Event> + use<> {
[self.created()]
.into_iter()
.merge_by(self.deleted(), Sequence::merge)
diff --git a/src/channel/repo.rs b/src/channel/repo.rs
index 6612151..91f245b 100644
--- a/src/channel/repo.rs
+++ b/src/channel/repo.rs
@@ -1,5 +1,5 @@
use futures::stream::{StreamExt as _, TryStreamExt as _};
-use sqlx::{sqlite::Sqlite, SqliteConnection, Transaction};
+use sqlx::{SqliteConnection, Transaction, sqlite::Sqlite};
use crate::{
channel::{Channel, History, Id},
@@ -13,7 +13,7 @@ pub trait Provider {
fn channels(&mut self) -> Channels;
}
-impl<'c> Provider for Transaction<'c, Sqlite> {
+impl Provider for Transaction<'_, Sqlite> {
fn channels(&mut self) -> Channels {
Channels(self)
}
@@ -21,7 +21,7 @@ impl<'c> Provider for Transaction<'c, Sqlite> {
pub struct Channels<'t>(&'t mut SqliteConnection);
-impl<'c> Channels<'c> {
+impl Channels<'_> {
pub async fn create(&mut self, name: &Name, created: &Instant) -> Result<History, sqlx::Error> {
let id = Id::generate();
let name = name.clone();
diff --git a/src/channel/routes/channel/post.rs b/src/channel/routes/channel/post.rs
index b51e691..3f14d64 100644
--- a/src/channel/routes/channel/post.rs
+++ b/src/channel/routes/channel/post.rs
@@ -8,7 +8,7 @@ use crate::{
app::App,
clock::RequestedAt,
error::{Internal, NotFound},
- message::{app::SendError, Body, Message},
+ message::{Body, Message, app::SendError},
token::extract::Identity,
};
diff --git a/src/channel/routes/mod.rs b/src/channel/routes/mod.rs
index c1ef5cd..c917348 100644
--- a/src/channel/routes/mod.rs
+++ b/src/channel/routes/mod.rs
@@ -1,6 +1,6 @@
use axum::{
- routing::{delete, post},
Router,
+ routing::{delete, post},
};
use crate::app::App;
diff --git a/src/channel/routes/post.rs b/src/channel/routes/post.rs
index 2cf1cc0..72eaad6 100644
--- a/src/channel/routes/post.rs
+++ b/src/channel/routes/post.rs
@@ -6,7 +6,7 @@ use axum::{
use crate::{
app::App,
- channel::{app, Channel},
+ channel::{Channel, app},
clock::RequestedAt,
error::Internal,
name::Name,
diff --git a/src/channel/snapshot.rs b/src/channel/snapshot.rs
index 129c0d6..046ac38 100644
--- a/src/channel/snapshot.rs
+++ b/src/channel/snapshot.rs
@@ -1,6 +1,6 @@
use super::{
- event::{Created, Event},
Id,
+ event::{Created, Event},
};
use crate::{clock::DateTime, name::Name};