rzerres/conduit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Timo Kösters
2020-06-11 22:34:49 +02:00
parent 4c98079c4c fa7612f069
commit 7b23069943
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client_server.rs
View File

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

1
src/database/uiaa.rs
View File

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