From a4a1e08ab81193112a2e14413d084916241c3fca Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 20 Feb 2019 16:16:14 +0300
Subject: flatten modules

---
 crates/ra_syntax/src/parsing/builder.rs           |  5 +++--
 crates/ra_syntax/src/parsing/parser_impl.rs       | 15 ++++++++-------
 crates/ra_syntax/src/parsing/parser_impl/event.rs |  2 +-
 crates/ra_syntax/src/parsing/reparsing.rs         |  3 ++-
 4 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'crates/ra_syntax/src/parsing')

diff --git a/crates/ra_syntax/src/parsing/builder.rs b/crates/ra_syntax/src/parsing/builder.rs
index 9d7ad06fe..9090c60c2 100644
--- a/crates/ra_syntax/src/parsing/builder.rs
+++ b/crates/ra_syntax/src/parsing/builder.rs
@@ -1,8 +1,9 @@
 use crate::{
     parsing::parser_impl::Sink,
-    syntax_node::{GreenNode, RaTypes, SyntaxError},
-    SmolStr, SyntaxKind,
+    syntax_node::{GreenNode, RaTypes},
+    SmolStr, SyntaxKind, SyntaxError,
 };
+
 use rowan::GreenNodeBuilder;
 
 pub(crate) struct GreenBuilder {
diff --git a/crates/ra_syntax/src/parsing/parser_impl.rs b/crates/ra_syntax/src/parsing/parser_impl.rs
index b710e9d5d..8cce1ab01 100644
--- a/crates/ra_syntax/src/parsing/parser_impl.rs
+++ b/crates/ra_syntax/src/parsing/parser_impl.rs
@@ -5,15 +5,16 @@ use std::cell::Cell;
 
 use crate::{
     SmolStr,
-    syntax_node::syntax_error::{ParseError, SyntaxError},
+    syntax_error::{ParseError, SyntaxError},
     parsing::{
-    lexer::Token,
-    parser_api::Parser,
-    parser_impl::{
-        event::{Event, EventProcessor},
-        input::{InputPosition, ParserInput},
+        lexer::Token,
+        parser_api::Parser,
+        parser_impl::{
+            event::{Event, EventProcessor},
+            input::{InputPosition, ParserInput},
+        },
     },
-}};
+};
 
 use crate::SyntaxKind::{self, EOF, TOMBSTONE};
 
diff --git a/crates/ra_syntax/src/parsing/parser_impl/event.rs b/crates/ra_syntax/src/parsing/parser_impl/event.rs
index fb43e19cc..2ddbdd34d 100644
--- a/crates/ra_syntax/src/parsing/parser_impl/event.rs
+++ b/crates/ra_syntax/src/parsing/parser_impl/event.rs
@@ -13,7 +13,7 @@ use crate::{
     SmolStr,
     SyntaxKind::{self, *},
     TextRange, TextUnit,
-    syntax_node::syntax_error::{
+    syntax_error::{
         ParseError,
         SyntaxError,
         SyntaxErrorKind,
diff --git a/crates/ra_syntax/src/parsing/reparsing.rs b/crates/ra_syntax/src/parsing/reparsing.rs
index 0a24dae0e..a88f53dae 100644
--- a/crates/ra_syntax/src/parsing/reparsing.rs
+++ b/crates/ra_syntax/src/parsing/reparsing.rs
@@ -1,7 +1,8 @@
 use crate::{
     SyntaxKind::*, TextRange, TextUnit,
     algo,
-    syntax_node::{GreenNode, SyntaxError, SyntaxNode},
+    syntax_node::{GreenNode, SyntaxNode},
+    syntax_error::SyntaxError,
     parsing::{
         grammar,
         parser_impl,
-- 
cgit v1.2.3