chore: bump other dependencies to make it work

This commit is contained in:
Timo Kösters 2021-03-04 12:29:08 +01:00
parent f4039902d8
commit 105f893cf3
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
8 changed files with 134 additions and 421 deletions

View file

@ -21,7 +21,7 @@ use ruma::{
EventType,
},
serde::Raw,
ServerName,
ServerName, UInt,
};
#[cfg(feature = "conduit_bin")]
@ -128,7 +128,7 @@ pub async fn get_room_visibility_route(
pub async fn get_public_rooms_filtered_helper(
db: &Database,
server: Option<&ServerName>,
limit: Option<js_int::UInt>,
limit: Option<UInt>,
since: Option<&str>,
filter: &IncomingFilter,
_network: &IncomingRoomNetwork,

View file

@ -73,11 +73,9 @@ impl Globals {
config,
keypair: Arc::new(keypair),
reqwest_client,
dns_resolver: TokioAsyncResolver::tokio_from_system_conf()
.await
.map_err(|_| {
Error::bad_config("Failed to set up trust dns resolver with system config.")
})?,
dns_resolver: TokioAsyncResolver::tokio_from_system_conf().map_err(|_| {
Error::bad_config("Failed to set up trust dns resolver with system config.")
})?,
actual_destination_cache: Arc::new(RwLock::new(HashMap::new())),
jwt_decoding_key,
})

View file

@ -1,5 +1,4 @@
use crate::{utils, Error, Result};
use js_int::UInt;
use ruma::{
events::{
presence::{PresenceEvent, PresenceEventContent},
@ -7,7 +6,7 @@ use ruma::{
},
presence::PresenceState,
serde::Raw,
RoomId, UserId,
RoomId, UInt, UserId,
};
use std::{
collections::HashMap,

View file

@ -1,5 +1,4 @@
use crate::{utils, Error, Result};
use js_int::UInt;
use ruma::{
api::client::{
error::ErrorKind,
@ -11,7 +10,7 @@ use ruma::{
encryption::DeviceKeys,
events::{AnyToDeviceEvent, EventType},
serde::Raw,
DeviceId, DeviceKeyAlgorithm, DeviceKeyId, UserId,
DeviceId, DeviceKeyAlgorithm, DeviceKeyId, UInt, UserId,
};
use std::{collections::BTreeMap, convert::TryFrom, mem, time::SystemTime};

View file

@ -1,12 +1,11 @@
use crate::Error;
use js_int::UInt;
use ruma::{
events::{
pdu::EventHash, room::member::MemberEventContent, AnyEvent, AnyRoomEvent, AnyStateEvent,
AnyStrippedStateEvent, AnySyncRoomEvent, AnySyncStateEvent, EventType, StateEvent,
},
serde::{to_canonical_value, CanonicalJsonObject, CanonicalJsonValue, Raw},
EventId, RoomId, RoomVersionId, ServerName, ServerSigningKeyId, UserId,
EventId, RoomId, RoomVersionId, ServerName, ServerSigningKeyId, UInt, UserId,
};
use serde::{Deserialize, Serialize};
use serde_json::json;

View file

@ -55,6 +55,7 @@ pub fn random_string(length: usize) -> String {
thread_rng()
.sample_iter(&rand::distributions::Alphanumeric)
.take(length)
.map(char::from)
.collect()
}