Merge branch 'lib-fix' into 'master'

Export conduits Config struct and fix clippy warnings

See merge request famedly/conduit!99

src/error.rs

@@ -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,

src/lib.rs

@@ -10,10 +10,10 @@ mod ruma_wrapper;
 pub mod server_server;
 mod utils;
 
-pub use database::Database;
+pub use database::{Config, Database};
 pub use error::{Error, Result};
 pub use pdu::PduEvent;
-pub use rocket::Config;
+pub use rocket::Config as RocketConfig;
 pub use ruma_wrapper::{ConduitResult, Ruma, RumaResponse};
 use std::ops::Deref;
 

src/server_server.rs

@@ -654,8 +654,7 @@ pub async fn send_transaction_message_route(
     for edu in body
         .edus
         .iter()
-        .map(|edu| serde_json::from_str::<Edu>(edu.json().get()))
-        .filter_map(|r| r.ok())
+        .filter_map(|edu| serde_json::from_str::<Edu>(edu.json().get()).ok())
     {
         match edu {
             Edu::Presence(_) => {}