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_parser/src/event.rs | 3 ++- crates/ra_parser/src/grammar.rs | 2 +- crates/ra_parser/src/parser.rs | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'crates/ra_parser/src') diff --git a/crates/ra_parser/src/event.rs b/crates/ra_parser/src/event.rs index 51beb0866..a7d06a815 100644 --- a/crates/ra_parser/src/event.rs +++ b/crates/ra_parser/src/event.rs @@ -10,8 +10,9 @@ use std::mem; use crate::{ - ParseError, TreeSink, + ParseError, SyntaxKind::{self, *}, + TreeSink, }; /// `Parser` produces a flat list of `Event`s. diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs index 5997636d6..658034097 100644 --- a/crates/ra_parser/src/grammar.rs +++ b/crates/ra_parser/src/grammar.rs @@ -37,9 +37,9 @@ mod type_params; mod types; use crate::{ + parser::{CompletedMarker, Marker, Parser}, SyntaxKind::{self, *}, TokenSet, - parser::{CompletedMarker, Marker, Parser}, }; pub(crate) fn root(p: &mut Parser) { diff --git a/crates/ra_parser/src/parser.rs b/crates/ra_parser/src/parser.rs index 8a2e253ac..159ed50df 100644 --- a/crates/ra_parser/src/parser.rs +++ b/crates/ra_parser/src/parser.rs @@ -3,10 +3,10 @@ use std::cell::Cell; use drop_bomb::DropBomb; use crate::{ - SyntaxKind::{self, ERROR, EOF, TOMBSTONE}, - TokenSource, ParseError, TokenSet, event::Event, - T + ParseError, + SyntaxKind::{self, EOF, ERROR, TOMBSTONE}, + TokenSet, TokenSource, T, }; /// `Parser` struct provides the low-level API for -- cgit v1.2.3