From f775c76d8a73df472e7b93bf7cb5988f89cbf5bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Thu, 18 Mar 2021 18:33:43 +0100
Subject: [PATCH] chore: get rid of warnings
---
rust-toolchain | 2 +-
rustfmt.toml | 1 +
src/client_server/read_marker.rs | 4 +---
src/client_server/sync.rs | 2 +-
src/database/pusher.rs | 14 ++++++++------
src/database/rooms.rs | 2 +-
src/database/sending.rs | 2 +-
src/error.rs | 13 +------------
src/main.rs | 1 -
src/ruma_wrapper.rs | 9 ++++-----
src/server_server.rs | 7 +++++--
11 files changed, 24 insertions(+), 33 deletions(-)
diff --git a/rust-toolchain b/rust-toolchain
index 21998d3c2..5a5c7211d 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.47.0
+1.50.0
diff --git a/rustfmt.toml b/rustfmt.toml
index e86028b10..739b454f2 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1 +1,2 @@
+unstable_features = true
imports_granularity="Crate"
diff --git a/src/client_server/read_marker.rs b/src/client_server/read_marker.rs
index 20464dbbe..555b7e721 100644
--- a/src/client_server/read_marker.rs
+++ b/src/client_server/read_marker.rs
@@ -3,9 +3,7 @@
use ruma::{
api::client::{
error::ErrorKind,
- r0::{
- capabilities::get_capabilities, read_marker::set_read_marker, receipt::create_receipt,
- },
+ r0::{read_marker::set_read_marker, receipt::create_receipt},
},
events::{AnyEphemeralRoomEvent, AnyEvent, EventType},
};
diff --git a/src/client_server/sync.rs b/src/client_server/sync.rs
index 280632b58..da2ddf447 100644
--- a/src/client_server/sync.rs
+++ b/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());
diff --git a/src/database/pusher.rs b/src/database/pusher.rs
index b6c6cf49a..cc421db32 100644
--- a/src/database/pusher.rs
+++ b/src/database/pusher.rs
@@ -9,17 +9,19 @@
},
OutgoingRequest,
},
- events::room::{
- member::{MemberEventContent, MembershipState},
- message::{MessageEventContent, MessageType, TextMessageEventContent},
- power_levels::PowerLevelsEventContent,
+ events::{
+ room::{
+ member::{MemberEventContent, MembershipState},
+ 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 {
diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index e6c3b93ad..d494d3340 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -3,7 +3,7 @@
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::{
diff --git a/src/database/sending.rs b/src/database/sending.rs
index b35f7c578..50bbc8bb9 100644
--- a/src/database/sending.rs
+++ b/src/database/sending.rs
@@ -10,7 +10,7 @@
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::{
diff --git a/src/error.rs b/src/error.rs
index 8a64e6325..65c5b4f4e 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,18 +1,7 @@
-use std::{
- collections::HashMap,
- sync::RwLock,
- time::{Duration, Instant},
-};
-
use log::error;
-use ruma::{
- api::client::{error::ErrorKind, r0::uiaa::UiaaInfo},
- events::room::message,
-};
+use ruma::api::client::{error::ErrorKind, r0::uiaa::UiaaInfo};
use thiserror::Error;
-use crate::{database::admin::AdminCommand, Database};
-
#[cfg(feature = "conduit_bin")]
use {
crate::RumaResponse,
diff --git a/src/main.rs b/src/main.rs
index 1aa4d5477..2ec3a425f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,7 +19,6 @@
use ruma::api::client::error::ErrorKind;
pub use ruma_wrapper::{ConduitResult, Ruma, RumaResponse};
-use log::LevelFilter;
use rocket::{
catch, catchers,
fairing::AdHoc,
diff --git a/src/ruma_wrapper.rs b/src/ruma_wrapper.rs
index 640771ff6..8c72529cd 100644
--- a/src/ruma_wrapper.rs
+++ b/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::{
- convert::{TryFrom, TryInto},
- ops::Deref,
-};
+use std::{convert::TryInto, ops::Deref};
#[cfg(feature = "conduit_bin")]
use {
@@ -24,6 +21,8 @@
tokio::io::AsyncReadExt,
Request, State,
},
+ ruma::api::{AuthScheme, IncomingRequest},
+ std::convert::TryFrom,
std::io::Cursor,
};
diff --git a/src/server_server.rs b/src/server_server.rs
index 59befde62..d43588ab3 100644
--- a/src/server_server.rs
+++ b/src/server_server.rs
@@ -3,7 +3,7 @@
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 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 @@
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,
--
GitLab