chore: get rid of warnings

rust-toolchain

@@ -1 +1 @@
-1.47.0
+1.50.0

rustfmt.toml

@@ -1 +1,2 @@
+unstable_features = true
 imports_granularity="Crate"

src/client_server/read_marker.rs

@@ -3,9 +3,7 @@ use crate::{ConduitResult, Database, Error, Ruma};
 use ruma::{
     api::client::{
         error::ErrorKind,
-        r0::{
+        r0::{read_marker::set_read_marker, receipt::create_receipt},
-            capabilities::get_capabilities, read_marker::set_read_marker, receipt::create_receipt,
-        },
     },
     events::{AnyEphemeralRoomEvent, AnyEvent, EventType},
 };

src/client_server/sync.rs

@@ -559,7 +559,7 @@ pub async fn sync_events_route(
             let pdus = db.rooms.pdus_since(&sender_user, &room_id, since)?;
             let mut room_events = pdus
                 .filter_map(|pdu| pdu.ok()) // Filter out buggy events
-                .take_while(|(pdu_id, pdu)| &since_member.0 != pdu)
+                .take_while(|(_, pdu)| &since_member.0 != pdu)
                 .map(|(_, pdu)| pdu.to_sync_room_event())
                 .collect::<Vec<_>>();
             room_events.push(since_member.0.to_sync_room_event());

src/database/pusher.rs

@@ -9,17 +9,19 @@ use ruma::{
         },
         OutgoingRequest,
     },
-    events::room::{
+    events::{
-        member::{MemberEventContent, MembershipState},
+        room::{
-        message::{MessageEventContent, MessageType, TextMessageEventContent},
+            member::{MemberEventContent, MembershipState},
-        power_levels::PowerLevelsEventContent,
+            message::{MessageEventContent, MessageType, TextMessageEventContent},
+            power_levels::PowerLevelsEventContent,
+        },
+        EventType,
     },
-    events::EventType,
     push::{Action, PushCondition, PushFormat, Ruleset, Tweak},
     uint, UInt, UserId,
 };
 
-use std::{convert::TryFrom, fmt::Debug, time::Duration};
+use std::{convert::TryFrom, fmt::Debug};
 
 #[derive(Debug, Clone)]
 pub struct PushData {

src/database/rooms.rs

@@ -3,7 +3,7 @@ mod edus;
 pub use edus::RoomEdus;
 
 use crate::{pdu::PduBuilder, utils, Database, Error, PduEvent, Result};
-use log::{debug, error, info, warn};
+use log::{error, warn};
 use regex::Regex;
 use ring::digest;
 use ruma::{

src/database/sending.rs

@@ -10,7 +10,7 @@ use crate::{
     appservice_server, database::pusher, server_server, utils, Database, Error, PduEvent, Result,
 };
 use federation::transactions::send_transaction_message;
-use log::{debug, error, info, warn};
+use log::{error, info, warn};
 use ring::digest;
 use rocket::futures::stream::{FuturesUnordered, StreamExt};
 use ruma::{

src/error.rs

@@ -1,18 +1,7 @@
-use std::{
-    collections::HashMap,
-    sync::RwLock,
-    time::{Duration, Instant},
-};
-
 use log::error;
-use ruma::{
+use ruma::api::client::{error::ErrorKind, r0::uiaa::UiaaInfo};
-    api::client::{error::ErrorKind, r0::uiaa::UiaaInfo},
-    events::room::message,
-};
 use thiserror::Error;
 
-use crate::{database::admin::AdminCommand, Database};
-
 #[cfg(feature = "conduit_bin")]
 use {
     crate::RumaResponse,

src/main.rs

@@ -19,7 +19,6 @@ pub use rocket::State;
 use ruma::api::client::error::ErrorKind;
 pub use ruma_wrapper::{ConduitResult, Ruma, RumaResponse};
 
-use log::LevelFilter;
 use rocket::{
     catch, catchers,
     fairing::AdHoc,

src/ruma_wrapper.rs

@@ -1,13 +1,10 @@
 use crate::Error;
 use ruma::{
-    api::{AuthScheme, IncomingRequest, OutgoingRequest},
+    api::OutgoingRequest,
     identifiers::{DeviceId, UserId},
     Outgoing,
 };
-use std::{
+use std::{convert::TryInto, ops::Deref};
-    convert::{TryFrom, TryInto},
-    ops::Deref,
-};
 
 #[cfg(feature = "conduit_bin")]
 use {
@@ -24,6 +21,8 @@ use {
         tokio::io::AsyncReadExt,
         Request, State,
     },
+    ruma::api::{AuthScheme, IncomingRequest},
+    std::convert::TryFrom,
     std::io::Cursor,
 };
 

src/server_server.rs

@@ -3,7 +3,7 @@ use get_profile_information::v1::ProfileField;
 use http::header::{HeaderValue, AUTHORIZATION, HOST};
 use log::{debug, error, info, warn};
 use regex::Regex;
-use rocket::{get, post, put, response::content::Json, State};
+use rocket::{response::content::Json, State};
 use ruma::{
     api::{
         client::error::ErrorKind,
@@ -28,7 +28,7 @@ use ruma::{
 use state_res::{Event, EventMap, StateMap};
 use std::{
     collections::{BTreeMap, BTreeSet, HashMap},
-    convert::{TryFrom, TryInto},
+    convert::TryFrom,
     fmt::Debug,
     future::Future,
     net::{IpAddr, SocketAddr},
@@ -38,6 +38,9 @@ use std::{
     time::{Duration, SystemTime},
 };
 
+#[cfg(feature = "conduit_bin")]
+use rocket::{get, post, put};
+
 #[tracing::instrument(skip(globals))]
 pub async fn send_request<T: OutgoingRequest>(
     globals: &crate::database::globals::Globals,