chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #15 from ruma/nested-imports

Browse Source 
Use nested imports
This commit is contained in:
Jimmy Cuadra 2019-01-09 14:53:32 -08:00 committed by GitHub
commit 025e981b96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.rustfmt.toml Normal file
View File

@ -0,0 +1 @@
merge_imports = true

15
src/lib.rs
View File

@ -26,8 +26,7 @@ extern crate serde_urlencoded;
#[cfg(test)]
extern crate url;
use std::convert::TryInto;
use std::io;
use std::{convert::TryInto, io};
use futures::future::FutureFrom;
use http::{Method, Request, Response, StatusCode};
@ -137,9 +136,9 @@ mod tests {
use std::convert::TryFrom;
use futures::future::{err, ok, FutureFrom, FutureResult};
use http::header::CONTENT_TYPE;
use http::method::Method;
use http::{Request as HttpRequest, Response as HttpResponse};
use http::{
header::CONTENT_TYPE, method::Method, Request as HttpRequest, Response as HttpResponse,
};
use ruma_identifiers::{RoomAliasId, RoomId};
use serde::de::{Deserialize, IntoDeserializer};
use serde_json;
@ -220,11 +219,9 @@ mod tests {
room_id: request_body.room_id,
room_alias: {
let segment = path_segments.get(5).unwrap().as_bytes();
let decoded =
percent_encoding::percent_decode(segment)
.decode_utf8_lossy();
let decoded = percent_encoding::percent_decode(segment).decode_utf8_lossy();
RoomAliasId::deserialize(decoded.into_deserializer())
.map_err(|e: serde_json::error::Error| e)?
.map_err(|e: serde_json::error::Error| e)?
},
})
}