diff --git a/Cargo.toml b/Cargo.toml index c4b3d64d..37d4d7ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,6 +6,7 @@ macro_use_extern_crate = "warn" missing_abi = "warn" noop_method_call = "warn" pointer_structural_match = "warn" +single_use_lifetimes = "warn" unreachable_pub = "warn" unsafe_op_in_unsafe_fn = "warn" unused_extern_crates = "warn" diff --git a/src/database/key_value/rooms/state_cache.rs b/src/database/key_value/rooms/state_cache.rs index 49e3842b..6cb7a8c6 100644 --- a/src/database/key_value/rooms/state_cache.rs +++ b/src/database/key_value/rooms/state_cache.rs @@ -264,7 +264,7 @@ impl service::rooms::state_cache::Data for KeyValueDatabase { } #[tracing::instrument(skip(self))] - fn server_in_room<'a>(&'a self, server: &ServerName, room_id: &RoomId) -> Result { + fn server_in_room(&self, server: &ServerName, room_id: &RoomId) -> Result { let mut key = server.as_bytes().to_vec(); key.push(0xff); key.extend_from_slice(room_id.as_bytes()); diff --git a/src/service/rooms/state_cache.rs b/src/service/rooms/state_cache.rs index 8b844f1e..78aba47b 100644 --- a/src/service/rooms/state_cache.rs +++ b/src/service/rooms/state_cache.rs @@ -226,11 +226,7 @@ impl Service { } #[tracing::instrument(skip(self))] - pub(crate) fn server_in_room<'a>( - &'a self, - server: &ServerName, - room_id: &RoomId, - ) -> Result { + pub(crate) fn server_in_room(&self, server: &ServerName, room_id: &RoomId) -> Result { self.db.server_in_room(server, room_id) } diff --git a/src/utils.rs b/src/utils.rs index a38a3fc6..b679e6b6 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -128,9 +128,7 @@ pub(crate) fn deserialize_from_str< deserializer: D, ) -> Result { struct Visitor, E>(std::marker::PhantomData); - impl<'de, T: FromStr, Err: std::fmt::Display> serde::de::Visitor<'de> - for Visitor - { + impl, Err: std::fmt::Display> serde::de::Visitor<'_> for Visitor { type Value = T; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { write!(formatter, "a parsable string") @@ -152,7 +150,7 @@ pub(crate) fn deserialize_from_str< /// string when passed to a format string. pub(crate) struct HtmlEscape<'a>(pub(crate) &'a str); -impl<'a> fmt::Display for HtmlEscape<'a> { +impl fmt::Display for HtmlEscape<'_> { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { // Because the internet is always right, turns out there's not that many // characters to escape: http://stackoverflow.com/questions/7381974