From 1834bae5b86c54ed9dece26e82436919d59e6cb7 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 4 Jul 2019 23:05:17 +0300 Subject: allow rustfmt to reorder imports This wasn't a right decision in the first place, the feature flag was broken in the last rustfmt release, and syntax highlighting of imports is more important anyway --- crates/ra_syntax/src/validation/block.rs | 5 +++-- crates/ra_syntax/src/validation/field_expr.rs | 7 ++++--- crates/ra_syntax/src/validation/unescape.rs | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'crates/ra_syntax/src/validation') diff --git a/crates/ra_syntax/src/validation/block.rs b/crates/ra_syntax/src/validation/block.rs index f2cf3cbbd..46650d9b0 100644 --- a/crates/ra_syntax/src/validation/block.rs +++ b/crates/ra_syntax/src/validation/block.rs @@ -1,7 +1,8 @@ -use crate::{SyntaxKind::*, - ast::{self, AttrsOwner, AstNode}, +use crate::{ + ast::{self, AstNode, AttrsOwner}, SyntaxError, SyntaxErrorKind::*, + SyntaxKind::*, }; pub(crate) fn validate_block_node(node: &ast::Block, errors: &mut Vec) { diff --git a/crates/ra_syntax/src/validation/field_expr.rs b/crates/ra_syntax/src/validation/field_expr.rs index 2b405062e..d3020edf7 100644 --- a/crates/ra_syntax/src/validation/field_expr.rs +++ b/crates/ra_syntax/src/validation/field_expr.rs @@ -1,6 +1,7 @@ -use crate::{ast::{self, FieldKind}, - SyntaxError, - SyntaxErrorKind::*, +use crate::{ + ast::{self, FieldKind}, + SyntaxError, + SyntaxErrorKind::*, }; pub(crate) fn validate_field_expr_node(node: &ast::FieldExpr, errors: &mut Vec) { diff --git a/crates/ra_syntax/src/validation/unescape.rs b/crates/ra_syntax/src/validation/unescape.rs index 91dbcfae8..4c3a7effc 100644 --- a/crates/ra_syntax/src/validation/unescape.rs +++ b/crates/ra_syntax/src/validation/unescape.rs @@ -7,8 +7,8 @@ //! //! Hopefully, we'll share this code in a proper way some day -use std::str::Chars; use std::ops::Range; +use std::str::Chars; #[derive(Debug, PartialEq, Eq, Clone, Hash)] pub enum EscapeError { -- cgit v1.2.3