Fix unused lifetims.
Fix unused pub(crate). Allow implicit hasher. Fix unused self. Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
@@ -455,7 +455,7 @@ where
|
|||||||
/// Check whether the given event passes the `m.room.power_levels` authorization
|
/// Check whether the given event passes the `m.room.power_levels` authorization
|
||||||
/// rules.
|
/// rules.
|
||||||
#[tracing::instrument(level = "trace", skip_all)]
|
#[tracing::instrument(level = "trace", skip_all)]
|
||||||
fn check_room_power_levels<'a, Creators, Pdu>(
|
fn check_room_power_levels<Creators, Pdu>(
|
||||||
room_power_levels_event: &RoomPowerLevelsEvent<Pdu>,
|
room_power_levels_event: &RoomPowerLevelsEvent<Pdu>,
|
||||||
current_room_power_levels_event: Option<&RoomPowerLevelsEvent<Pdu>>,
|
current_room_power_levels_event: Option<&RoomPowerLevelsEvent<Pdu>>,
|
||||||
rules: &AuthorizationRules,
|
rules: &AuthorizationRules,
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ type ConflictVec = Vec<OwnedEventId>;
|
|||||||
///
|
///
|
||||||
/// [state resolution]: https://spec.matrix.org/latest/rooms/v2/#state-resolution
|
/// [state resolution]: https://spec.matrix.org/latest/rooms/v2/#state-resolution
|
||||||
#[tracing::instrument(level = "debug", skip_all)]
|
#[tracing::instrument(level = "debug", skip_all)]
|
||||||
pub async fn resolve<'a, States, AuthSets, FetchExists, ExistsFut, FetchEvent, EventFut, Pdu>(
|
pub async fn resolve<States, AuthSets, FetchExists, ExistsFut, FetchEvent, EventFut, Pdu>(
|
||||||
rules: &RoomVersionRules,
|
rules: &RoomVersionRules,
|
||||||
state_maps: States,
|
state_maps: States,
|
||||||
auth_sets: AuthSets,
|
auth_sets: AuthSets,
|
||||||
|
|||||||
@@ -75,6 +75,7 @@ impl PartialOrd for TieBreaker<'_> {
|
|||||||
graph = graph.len(),
|
graph = graph.len(),
|
||||||
)
|
)
|
||||||
)]
|
)]
|
||||||
|
#[allow(clippy::implicit_hasher)]
|
||||||
pub async fn topological_sort<Query, Fut>(
|
pub async fn topological_sort<Query, Fut>(
|
||||||
graph: &HashMap<OwnedEventId, HashSet<OwnedEventId>>,
|
graph: &HashMap<OwnedEventId, HashSet<OwnedEventId>>,
|
||||||
query: &Query,
|
query: &Query,
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ where
|
|||||||
|
|
||||||
#[implement(super::Map)]
|
#[implement(super::Map)]
|
||||||
#[tracing::instrument(name = "batch_cached", level = "trace", skip_all)]
|
#[tracing::instrument(name = "batch_cached", level = "trace", skip_all)]
|
||||||
pub(crate) fn get_batch_cached<'a, I, K>(
|
pub(crate) fn _get_batch_cached<'a, I, K>(
|
||||||
&self,
|
&self,
|
||||||
keys: I,
|
keys: I,
|
||||||
) -> impl Iterator<Item = Result<Option<Handle<'_>>>> + Send + use<'_, I, K>
|
) -> impl Iterator<Item = Result<Option<Handle<'_>>>> + Send + use<'_, I, K>
|
||||||
|
|||||||
@@ -188,7 +188,7 @@ fn spawn_one(
|
|||||||
let handle = thread::Builder::new()
|
let handle = thread::Builder::new()
|
||||||
.name(WORKER_NAME.into())
|
.name(WORKER_NAME.into())
|
||||||
.stack_size(WORKER_STACK_SIZE)
|
.stack_size(WORKER_STACK_SIZE)
|
||||||
.spawn(move || self.worker(id, recv))?;
|
.spawn(move || self.worker(id, &recv))?;
|
||||||
|
|
||||||
workers.push(handle);
|
workers.push(handle);
|
||||||
|
|
||||||
@@ -267,9 +267,9 @@ async fn execute(&self, queue: &Sender<Cmd>, cmd: Cmd) -> Result {
|
|||||||
tid = ?thread::current().id(),
|
tid = ?thread::current().id(),
|
||||||
),
|
),
|
||||||
)]
|
)]
|
||||||
fn worker(self: Arc<Self>, id: usize, recv: Receiver<Cmd>) {
|
fn worker(self: Arc<Self>, id: usize, recv: &Receiver<Cmd>) {
|
||||||
self.worker_init(id);
|
self.worker_init(id);
|
||||||
self.worker_loop(&recv);
|
self.worker_loop(recv);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[implement(Pool)]
|
#[implement(Pool)]
|
||||||
@@ -316,7 +316,7 @@ fn worker_loop(self: &Arc<Self>, recv: &Receiver<Cmd>) {
|
|||||||
self.busy.fetch_add(1, Ordering::Relaxed);
|
self.busy.fetch_add(1, Ordering::Relaxed);
|
||||||
|
|
||||||
while let Ok(cmd) = self.worker_wait(recv) {
|
while let Ok(cmd) = self.worker_wait(recv) {
|
||||||
self.worker_handle(cmd);
|
worker_handle(cmd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -337,23 +337,21 @@ fn worker_wait(self: &Arc<Self>, recv: &Receiver<Cmd>) -> Result<Cmd, RecvError>
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
#[implement(Pool)]
|
fn worker_handle(cmd: Cmd) {
|
||||||
fn worker_handle(self: &Arc<Self>, cmd: Cmd) {
|
|
||||||
match cmd {
|
match cmd {
|
||||||
| Cmd::Get(cmd) if cmd.key.len() == 1 => self.handle_get(cmd),
|
| Cmd::Get(cmd) if cmd.key.len() == 1 => handle_get(cmd),
|
||||||
| Cmd::Get(cmd) => self.handle_batch(cmd),
|
| Cmd::Get(cmd) => handle_batch(cmd),
|
||||||
| Cmd::Iter(cmd) => self.handle_iter(cmd),
|
| Cmd::Iter(cmd) => handle_iter(cmd),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[implement(Pool)]
|
|
||||||
#[tracing::instrument(
|
#[tracing::instrument(
|
||||||
name = "iter",
|
name = "iter",
|
||||||
level = "trace",
|
level = "trace",
|
||||||
skip_all,
|
skip_all,
|
||||||
fields(%cmd.map),
|
fields(%cmd.map),
|
||||||
)]
|
)]
|
||||||
fn handle_iter(&self, mut cmd: Seek) {
|
fn handle_iter(mut cmd: Seek) {
|
||||||
let chan = cmd.res.take().expect("missing result channel");
|
let chan = cmd.res.take().expect("missing result channel");
|
||||||
|
|
||||||
if chan.is_canceled() {
|
if chan.is_canceled() {
|
||||||
@@ -372,7 +370,6 @@ fn handle_iter(&self, mut cmd: Seek) {
|
|||||||
let _chan_sent = chan_result.is_ok();
|
let _chan_sent = chan_result.is_ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
#[implement(Pool)]
|
|
||||||
#[tracing::instrument(
|
#[tracing::instrument(
|
||||||
name = "batch",
|
name = "batch",
|
||||||
level = "trace",
|
level = "trace",
|
||||||
@@ -382,7 +379,7 @@ fn handle_iter(&self, mut cmd: Seek) {
|
|||||||
keys = %cmd.key.len(),
|
keys = %cmd.key.len(),
|
||||||
),
|
),
|
||||||
)]
|
)]
|
||||||
fn handle_batch(self: &Arc<Self>, mut cmd: Get) {
|
fn handle_batch(mut cmd: Get) {
|
||||||
debug_assert!(cmd.key.len() > 1, "should have more than one key");
|
debug_assert!(cmd.key.len() > 1, "should have more than one key");
|
||||||
debug_assert!(!cmd.key.iter().any(SmallVec::is_empty), "querying for empty key");
|
debug_assert!(!cmd.key.iter().any(SmallVec::is_empty), "querying for empty key");
|
||||||
|
|
||||||
@@ -401,14 +398,13 @@ fn handle_batch(self: &Arc<Self>, mut cmd: Get) {
|
|||||||
let _chan_sent = chan_result.is_ok();
|
let _chan_sent = chan_result.is_ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
#[implement(Pool)]
|
|
||||||
#[tracing::instrument(
|
#[tracing::instrument(
|
||||||
name = "get",
|
name = "get",
|
||||||
level = "trace",
|
level = "trace",
|
||||||
skip_all,
|
skip_all,
|
||||||
fields(%cmd.map),
|
fields(%cmd.map),
|
||||||
)]
|
)]
|
||||||
fn handle_get(&self, mut cmd: Get) {
|
fn handle_get(mut cmd: Get) {
|
||||||
debug_assert!(!cmd.key[0].is_empty(), "querying for empty key");
|
debug_assert!(!cmd.key[0].is_empty(), "querying for empty key");
|
||||||
|
|
||||||
// Obtain the result channel.
|
// Obtain the result channel.
|
||||||
|
|||||||
@@ -173,7 +173,7 @@ impl Service {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tracing::instrument(skip(self), level = "debug")]
|
#[tracing::instrument(skip(self), level = "debug")]
|
||||||
pub fn all_local_aliases<'a>(&'a self) -> impl Stream<Item = (&RoomId, &str)> + Send + 'a {
|
pub fn all_local_aliases(&self) -> impl Stream<Item = (&RoomId, &str)> + Send + '_ {
|
||||||
self.db
|
self.db
|
||||||
.alias_roomid
|
.alias_roomid
|
||||||
.stream()
|
.stream()
|
||||||
|
|||||||
@@ -320,7 +320,7 @@ pub(crate) fn mark_as_left(&self, user_id: &UserId, room_id: &RoomId) {
|
|||||||
/// `update_membership` instead
|
/// `update_membership` instead
|
||||||
#[implement(super::Service)]
|
#[implement(super::Service)]
|
||||||
#[tracing::instrument(skip(self), level = "debug")]
|
#[tracing::instrument(skip(self), level = "debug")]
|
||||||
pub(crate) fn mark_as_knocked(
|
pub(crate) fn _mark_as_knocked(
|
||||||
&self,
|
&self,
|
||||||
user_id: &UserId,
|
user_id: &UserId,
|
||||||
room_id: &RoomId,
|
room_id: &RoomId,
|
||||||
|
|||||||
Reference in New Issue
Block a user