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

Merge pull request #6 from ruma/nested-imports

Browse Source 
Use nested imports
This commit is contained in:
Jimmy Cuadra 2019-01-09 14:51:36 -08:00 committed by GitHub
commit dbbc8be729
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 19 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

46
src/lib.rs
View File

@ -20,15 +20,18 @@ extern crate diesel;
#[cfg(test)] #[cfg(test)]
extern crate serde_json; extern crate serde_json;
use std::convert::TryFrom; use std::{
use std::error::Error as StdError; convert::TryFrom,
use std::fmt::{Display, Formatter, Result as FmtResult}; error::Error as StdError,
fmt::{Display, Formatter, Result as FmtResult},
};
use rand::distributions::Alphanumeric; use rand::{distributions::Alphanumeric, thread_rng, Rng};
use rand::{thread_rng, Rng};
use regex::Regex; use regex::Regex;
use serde::de::{Error as SerdeError, Unexpected, Visitor}; use serde::{
use serde::{Deserialize, Deserializer, Serialize, Serializer}; de::{Error as SerdeError, Unexpected, Visitor},
Deserialize, Deserializer, Serialize, Serializer,
};
use url::{ParseError, Url}; use url::{ParseError, Url};
pub use url::Host; pub use url::Host;
@ -733,14 +736,14 @@ impl<'de> Visitor<'de> for UserIdVisitor {
#[cfg(feature = "diesel")] #[cfg(feature = "diesel")]
mod diesel_integration { mod diesel_integration {
use std::convert::TryFrom; use std::{convert::TryFrom, error::Error as StdError, io::Write};
use std::error::Error as StdError;
use std::io::Write;
use diesel::backend::Backend; use diesel::{
use diesel::deserialize::{FromSql, Result as DeserializeResult}; backend::Backend,
use diesel::serialize::{Output, Result as SerializeResult, ToSql}; deserialize::{FromSql, Result as DeserializeResult},
use diesel::sql_types::Text; serialize::{Output, Result as SerializeResult, ToSql},
sql_types::Text,
};
macro_rules! diesel_impl { macro_rules! diesel_impl {
($name:ident) => { ($name:ident) => {
@ -812,7 +815,8 @@ mod tests {
assert_eq!( assert_eq!(
to_string( to_string(
&EventId::try_from("$39hvsi03hlne:example.com").expect("Failed to create EventId.") &EventId::try_from("$39hvsi03hlne:example.com").expect("Failed to create EventId.")
).expect("Failed to convert EventId to JSON."), )
.expect("Failed to convert EventId to JSON."),
r#""$39hvsi03hlne:example.com""# r#""$39hvsi03hlne:example.com""#
); );
} }
@ -895,7 +899,8 @@ mod tests {
assert_eq!( assert_eq!(
to_string( to_string(
&RoomAliasId::try_from("#ruma:example.com").expect("Failed to create RoomAliasId.") &RoomAliasId::try_from("#ruma:example.com").expect("Failed to create RoomAliasId.")
).expect("Failed to convert RoomAliasId to JSON."), )
.expect("Failed to convert RoomAliasId to JSON."),
r##""#ruma:example.com""## r##""#ruma:example.com""##
); );
} }
@ -1005,7 +1010,8 @@ mod tests {
assert_eq!( assert_eq!(
to_string( to_string(
&RoomId::try_from("!29fhd83h92h0:example.com").expect("Failed to create RoomId.") &RoomId::try_from("!29fhd83h92h0:example.com").expect("Failed to create RoomId.")
).expect("Failed to convert RoomId to JSON."), )
.expect("Failed to convert RoomId to JSON."),
r#""!29fhd83h92h0:example.com""# r#""!29fhd83h92h0:example.com""#
); );
} }
@ -1107,7 +1113,8 @@ mod tests {
to_string( to_string(
&RoomIdOrAliasId::try_from("#ruma:example.com") &RoomIdOrAliasId::try_from("#ruma:example.com")
.expect("Failed to create RoomAliasId.") .expect("Failed to create RoomAliasId.")
).expect("Failed to convert RoomAliasId to JSON."), )
.expect("Failed to convert RoomAliasId to JSON."),
r##""#ruma:example.com""## r##""#ruma:example.com""##
); );
} }
@ -1118,7 +1125,8 @@ mod tests {
to_string( to_string(
&RoomIdOrAliasId::try_from("!29fhd83h92h0:example.com") &RoomIdOrAliasId::try_from("!29fhd83h92h0:example.com")
.expect("Failed to create RoomId.") .expect("Failed to create RoomId.")
).expect("Failed to convert RoomId to JSON."), )
.expect("Failed to convert RoomId to JSON."),
r#""!29fhd83h92h0:example.com""# r#""!29fhd83h92h0:example.com""#
); );
} }