Merge branch 'lib-fix' into 'master'

Export conduits Config struct and fix clippy warnings

See merge request famedly/conduit!99
This commit is contained in:
Timo Kösters 2021-07-11 11:42:07 +00:00
commit 13c0beafa6
4 changed files with 8 additions and 8 deletions

View file

@ -1,4 +1,4 @@
use log::{error, warn};
use log::warn;
use ruma::{
api::client::{
error::{Error as RumaError, ErrorKind},
@ -12,6 +12,7 @@ use thiserror::Error;
use {
crate::RumaResponse,
http::StatusCode,
log::error,
rocket::{
response::{self, Responder},
Request,