chore: fix clippy lints (#1541)

* chore: fix clippy lints

* use is_none_or

Author: niklasad1

core/src/client/mod.rs

@@ -425,7 +425,7 @@ where
 	type Item = Result<Notif, serde_json::Error>;
 	fn poll_next(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> task::Poll<Option<Self::Item>> {
 		let res = match futures_util::ready!(self.rx.poll_next_unpin(cx)) {
-			Some(v) => Some(serde_json::from_value::<Notif>(v).map_err(Into::into)),
+			Some(v) => Some(serde_json::from_value::<Notif>(v)),
 			None => {
 				self.is_closed = true;
 				None

core/src/server/subscription.rs

@@ -372,7 +372,7 @@ impl SubscriptionSink {
 		}
 
 		let json = sub_message_to_json(msg, SubNotifResultOrError::Result, &self.uniq_sub.sub_id, self.method);
-		self.inner.send(json).await.map_err(Into::into)
+		self.inner.send(json).await
 	}
 
 	/// Similar to `SubscriptionSink::send` but only waits for a limited time.
@@ -383,7 +383,7 @@ impl SubscriptionSink {
 		}
 
 		let json = sub_message_to_json(msg, SubNotifResultOrError::Result, &self.uniq_sub.sub_id, self.method);
-		self.inner.send_timeout(json, timeout).await.map_err(Into::into)
+		self.inner.send_timeout(json, timeout).await
 	}
 
 	/// Attempts to immediately send out the message as JSON string to the subscribers but fails if the
@@ -399,7 +399,7 @@ impl SubscriptionSink {
 		}
 
 		let json = sub_message_to_json(msg, SubNotifResultOrError::Result, &self.uniq_sub.sub_id, self.method);
-		self.inner.try_send(json).map_err(Into::into)
+		self.inner.try_send(json)
 	}
 
 	/// Returns whether the subscription is closed.

server/src/middleware/http/host_filter.rs

@@ -122,7 +122,7 @@ where
 			return async { Ok(http::response::malformed()) }.boxed();
 		};
 
-		if self.filter.as_ref().map_or(true, |f| f.recognize(&authority)) {
+		if self.filter.as_ref().is_none_or(|f| f.recognize(&authority)) {
 			Box::pin(self.inner.call(request).map_err(Into::into))
 		} else {
 			tracing::debug!(target: LOG_TARGET, "Denied request: {:?}", request);

server/src/transport/http.rs

@@ -18,7 +18,7 @@ pub fn content_type_is_json<T: Body>(request: &HttpRequest<T>) -> bool {
 
 /// Returns true if the `content_type` header indicates a valid JSON message.
 pub fn is_json(content_type: Option<&hyper::header::HeaderValue>) -> bool {
-	content_type.and_then(|val| val.to_str().ok()).map_or(false, |content| {
+	content_type.and_then(|val| val.to_str().ok()).is_some_and(|content| {
 		content.eq_ignore_ascii_case("application/json")
 			|| content.eq_ignore_ascii_case("application/json; charset=utf-8")
 			|| content.eq_ignore_ascii_case("application/json;charset=utf-8")

server/src/transport/ws.rs

@@ -34,7 +34,7 @@ enum Incoming {
 
 pub(crate) async fn send_message(sender: &mut Sender, response: String) -> Result<(), SokettoError> {
 	sender.send_text_owned(response).await?;
-	sender.flush().await.map_err(Into::into)
+	sender.flush().await
 }
 
 pub(crate) async fn send_ping(sender: &mut Sender) -> Result<(), SokettoError> {
@@ -44,7 +44,7 @@ pub(crate) async fn send_ping(sender: &mut Sender) -> Result<(), SokettoError> {
 	// Byte slice fails if the provided slice is larger than 125 bytes.
 	let byte_slice = ByteSlice125::try_from(slice).expect("Empty slice should fit into ByteSlice125");
 	sender.send_ping(byte_slice).await?;
-	sender.flush().await.map_err(Into::into)
+	sender.flush().await
 }
 
 pub(crate) struct BackgroundTaskParams<S> {