dolysis/conduwuit
3
0
Fork 0
mirror of https://github.com/girlbossceo/conduwuit.git synced 2024-11-27 02:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rust-1.53' into 'next'

Browse source 
Restore compatibility with Rust 1.53

See merge request famedly/conduit!244
This commit is contained in:
Timo Kösters 2022-01-13 11:09:14 +00:00
parent f5d1dda766 bcf4ede0bc
commit fbcbadf265
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client_server/unversioned.rs
View file

@ -1,3 +1,5 @@
use std::{collections::BTreeMap, iter::FromIterator};
use crate::ConduitResult; use crate::ConduitResult;
use ruma::api::client::unversioned::get_supported_versions; use ruma::api::client::unversioned::get_supported_versions;
@ -19,7 +21,7 @@ use rocket::get;
pub async fn get_supported_versions_route() -> ConduitResult<get_supported_versions::Response> { pub async fn get_supported_versions_route() -> ConduitResult<get_supported_versions::Response> {
let resp = get_supported_versions::Response { let resp = get_supported_versions::Response {
versions: vec!["r0.5.0".to_owned(), "r0.6.0".to_owned()], versions: vec!["r0.5.0".to_owned(), "r0.6.0".to_owned()],
unstable_features: [("org.matrix.e2e_cross_signing".to_owned(), true)].into(), unstable_features: BTreeMap::from_iter([("org.matrix.e2e_cross_signing".to_owned(), true)]),
}; };
Ok(resp.into()) Ok(resp.into())