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

6
Cargo.lock generated
View file

@ -983,9 +983,9 @@ dependencies = [
[[package]]
name = "itertools"
version = "0.10.0"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
dependencies = [
"either",
]
@ -2123,7 +2123,7 @@ name = "ruma-state-res"
version = "0.2.0"
source = "git+https://github.com/ruma/ruma?rev=174555857ef90d49e4b9a672be9e2fe0acdc2687#174555857ef90d49e4b9a672be9e2fe0acdc2687"
dependencies = [
"itertools 0.10.0",
"itertools 0.10.1",
"js_int",
"maplit",
"ruma-common",

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,

View file

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

View file

@ -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(_) => {}