Enable merge_imports rustfmt setting.

style: Enable rustfmt merge_imports and format

This commit enables the rustfmt merge_imports setting
and formats the whole code base accordingly.

Note that the setting is not stable yet, but will be with Rust 1.38.

In the meantime, running fmt on stable will just leave the
changes alone so no problems should occur.
This commit is contained in:
Christoph Herzog 2019-08-21 15:23:53 +02:00 committed by Christian Legnitto
parent 67480d176b
commit c270c038ef
3 changed files with 12 additions and 9 deletions

View file

@ -180,7 +180,7 @@ pub use crate::{
pub type BoxFuture<'a, T> = std::pin::Pin<Box<dyn std::future::Future<Output = T> + 'a + Send>>;
#[cfg(feature = "async")]
pub use crate::types::async_await::{GraphQLTypeAsync};
pub use crate::types::async_await::GraphQLTypeAsync;
/// An error that prevented query execution
#[derive(Debug, PartialEq)]

View file

@ -1,9 +1,12 @@
use crate::{
ast::{Directive, FromInputValue, InputValue, Selection},
value::{Object, ScalarRefValue, ScalarValue, Value},
};
use crate::ast::{Directive, FromInputValue, InputValue, Selection};
use crate::value::{Object, ScalarRefValue, ScalarValue, Value};
use crate::executor::{ExecutionResult, Executor};
use crate::parser::Spanning;
use crate::{
executor::{ExecutionResult, Executor},
parser::Spanning,
};
use crate::BoxFuture;

View file

@ -42,14 +42,14 @@ Check the LICENSE file for details.
use std::{
error::Error,
io::Cursor,
io::{Cursor, Read},
};
use rocket::{
data::{FromDataFuture, FromDataSimple},
data::{FromDataSimple, Outcome as FromDataOutcome},
http::{ContentType, RawStr, Status},
request::{FormItems, FromForm, FromFormValue},
response::{content, Responder, Response, ResultFuture},
response::{content, Responder, Response},
Data,
Outcome::{Failure, Forward, Success},
Request,