Skip to content

Commit fbfb272

Browse files
committed
Merge branch 'main' into search_messages_3#122
2 parents ca2ca78 + 9c6fd89 commit fbfb272

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/sliding_sync.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ pub type OnMediaFetchedFn = fn(
218218

219219

220220
/// The set of requests for async work that can be made to the worker thread.
221+
#[allow(clippy::large_enum_variant)]
221222
pub enum MatrixRequest {
222223
/// Request from the login screen to log in with the given credentials.
223224
Login(LoginRequest),
@@ -2660,8 +2661,7 @@ async fn spawn_sso_server(
26602661
}
26612662
Uri::new(&sso_url).open().map_err(|err| {
26622663
Error::UnknownError(
2663-
Box::new(io::Error::new(
2664-
io::ErrorKind::Other,
2664+
Box::new(io::Error::other(
26652665
format!("Unable to open SSO login url. Error: {:?}", err),
26662666
))
26672667
.into(),

0 commit comments

Comments
 (0)