aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_syntax/src/validation
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-07-04 21:05:17 +0100
committerAleksey Kladov <[email protected]>2019-07-04 21:09:09 +0100
commit1834bae5b86c54ed9dece26e82436919d59e6cb7 (patch)
tree92c8b984e874b67fa1831613464bbe356c1af3dd /crates/ra_syntax/src/validation
parent2b2cd829b0f95aef338227deb05ec7503dae9b6c (diff)
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
Diffstat (limited to 'crates/ra_syntax/src/validation')
-rw-r--r--crates/ra_syntax/src/validation/block.rs5
-rw-r--r--crates/ra_syntax/src/validation/field_expr.rs7
-rw-r--r--crates/ra_syntax/src/validation/unescape.rs2
3 files changed, 8 insertions, 6 deletions
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 @@
1use crate::{SyntaxKind::*, 1use crate::{
2 ast::{self, AttrsOwner, AstNode}, 2 ast::{self, AstNode, AttrsOwner},
3 SyntaxError, 3 SyntaxError,
4 SyntaxErrorKind::*, 4 SyntaxErrorKind::*,
5 SyntaxKind::*,
5}; 6};
6 7
7pub(crate) fn validate_block_node(node: &ast::Block, errors: &mut Vec<SyntaxError>) { 8pub(crate) fn validate_block_node(node: &ast::Block, errors: &mut Vec<SyntaxError>) {
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 @@
1use crate::{ast::{self, FieldKind}, 1use crate::{
2 SyntaxError, 2 ast::{self, FieldKind},
3 SyntaxErrorKind::*, 3 SyntaxError,
4 SyntaxErrorKind::*,
4}; 5};
5 6
6pub(crate) fn validate_field_expr_node(node: &ast::FieldExpr, errors: &mut Vec<SyntaxError>) { 7pub(crate) fn validate_field_expr_node(node: &ast::FieldExpr, errors: &mut Vec<SyntaxError>) {
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 @@
7//! 7//!
8//! Hopefully, we'll share this code in a proper way some day 8//! Hopefully, we'll share this code in a proper way some day
9 9
10use std::str::Chars;
11use std::ops::Range; 10use std::ops::Range;
11use std::str::Chars;
12 12
13#[derive(Debug, PartialEq, Eq, Clone, Hash)] 13#[derive(Debug, PartialEq, Eq, Clone, Hash)]
14pub enum EscapeError { 14pub enum EscapeError {