Merge pull request 'Remove unused imports' (#119) from PublicByte/conduit:remove-unused-imports into master

This commit is contained in:
Timo Kösters 2020-06-11 22:34:49 +02:00
commit 7b23069943
2 changed files with 2 additions and 3 deletions

View file

@ -5,7 +5,7 @@ use std::{
};
use crate::{utils, ConduitResult, Database, Error, Ruma};
use log::{debug, warn};
use log::warn;
use rocket::{delete, get, options, post, put, State};
use ruma::{
api::client::{
@ -46,7 +46,7 @@ use ruma::{
thirdparty::get_protocols,
to_device::{self, send_event_to_device},
typing::create_typing_event,
uiaa::{AuthFlow, UiaaInfo, UiaaResponse},
uiaa::{AuthFlow, UiaaInfo},
user_directory::search_users,
},
unversioned::get_supported_versions,

View file

@ -1,5 +1,4 @@
use crate::{Error, Result};
use log::debug;
use ruma::{
api::client::{
error::ErrorKind,