flatten modules

15 files changed, 37 insertions, 40 deletions

diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs
index 755ccd8e0..edd5b4a28 100644
--- a/crates/ra_syntax/src/lib.rs
+++ b/crates/ra_syntax/src/lib.rs
@@ -26,12 +26,16 @@ pub mod utils;
 mod validation;
 mod syntax_node;
 mod ptr;
+mod syntax_error;
+mod syntax_text;
 
 pub use rowan::{SmolStr, TextRange, TextUnit};
 pub use crate::{
     ast::AstNode,
     syntax_kinds::SyntaxKind,
-    syntax_node::{Direction, SyntaxError, SyntaxNode, WalkEvent, Location, TreeArc},
+    syntax_error::{SyntaxError, SyntaxErrorKind, Location},
+    syntax_text::SyntaxText,
+    syntax_node::{Direction,  SyntaxNode, WalkEvent, TreeArc},
     ptr::{SyntaxNodePtr, AstPtr},
     parsing::{tokenize, Token},
 };
diff --git a/crates/ra_syntax/src/parsing.rs b/crates/ra_syntax/src/parsing.rs
index 2c92d554e..023e1031c 100644
--- a/crates/ra_syntax/src/parsing.rs
+++ b/crates/ra_syntax/src/parsing.rs
@@ -8,8 +8,9 @@ mod reparsing;
 mod grammar;
 
 use crate::{
+    SyntaxError,
     parsing::builder::GreenBuilder,
-    syntax_node::{GreenNode, SyntaxError},
+    syntax_node::GreenNode,
 };
 
 pub use self::lexer::{tokenize, Token};
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,
diff --git a/crates/ra_syntax/src/syntax_node/syntax_error.rs b/crates/ra_syntax/src/syntax_error.rs
index 4ff998090..4ff998090 100644
--- a/crates/ra_syntax/src/syntax_node/syntax_error.rs
+++ b/crates/ra_syntax/src/syntax_error.rs
diff --git a/crates/ra_syntax/src/syntax_node.rs b/crates/ra_syntax/src/syntax_node.rs
index a0d7c32ec..aa627398d 100644
--- a/crates/ra_syntax/src/syntax_node.rs
+++ b/crates/ra_syntax/src/syntax_node.rs
@@ -1,13 +1,12 @@
-pub mod syntax_error;
-mod syntax_text;
-
 use std::{fmt, borrow::Borrow};
 
-use self::syntax_text::SyntaxText;
-use crate::{SmolStr, SyntaxKind, TextRange};
 use rowan::{Types, TransparentNewType};
 
-pub use self::syntax_error::{SyntaxError, SyntaxErrorKind, Location};
+use crate::{
+    SmolStr, SyntaxKind, TextRange, SyntaxText,
+    syntax_error::SyntaxError,
+};
+
 pub use rowan::WalkEvent;
 
 #[derive(Debug, Clone, Copy)]
diff --git a/crates/ra_syntax/src/syntax_node/syntax_text.rs b/crates/ra_syntax/src/syntax_text.rs
index 84e5b231a..84e5b231a 100644
--- a/crates/ra_syntax/src/syntax_node/syntax_text.rs
+++ b/crates/ra_syntax/src/syntax_text.rs
diff --git a/crates/ra_syntax/src/validation.rs b/crates/ra_syntax/src/validation.rs
index 10672d6bf..69958f0d7 100644
--- a/crates/ra_syntax/src/validation.rs
+++ b/crates/ra_syntax/src/validation.rs
@@ -5,7 +5,7 @@ mod string;
 mod block;
 
 use crate::{
-    SourceFile, syntax_node::SyntaxError, AstNode,
+    SourceFile, SyntaxError, AstNode,
     ast,
     algo::visit::{visitor_ctx, VisitorCtx},
 };
diff --git a/crates/ra_syntax/src/validation/block.rs b/crates/ra_syntax/src/validation/block.rs
index de949d967..f2cf3cbbd 100644
--- a/crates/ra_syntax/src/validation/block.rs
+++ b/crates/ra_syntax/src/validation/block.rs
@@ -1,9 +1,7 @@
 use crate::{SyntaxKind::*,
     ast::{self, AttrsOwner, AstNode},
-    syntax_node::{
-        SyntaxError,
-        SyntaxErrorKind::*,
-    },
+    SyntaxError,
+    SyntaxErrorKind::*,
 };
 
 pub(crate) fn validate_block_node(node: &ast::Block, errors: &mut Vec<SyntaxError>) {
diff --git a/crates/ra_syntax/src/validation/byte.rs b/crates/ra_syntax/src/validation/byte.rs
index acdc12552..838e7a65f 100644
--- a/crates/ra_syntax/src/validation/byte.rs
+++ b/crates/ra_syntax/src/validation/byte.rs
@@ -5,10 +5,8 @@ use crate::{
     string_lexing::{self, StringComponentKind},
     TextRange,
     validation::char,
-    syntax_node::{
-        SyntaxError,
-        SyntaxErrorKind::*,
-    },
+    SyntaxError,
+    SyntaxErrorKind::*,
 };
 
 pub(super) fn validate_byte_node(node: &ast::Byte, errors: &mut Vec<SyntaxError>) {
diff --git a/crates/ra_syntax/src/validation/byte_string.rs b/crates/ra_syntax/src/validation/byte_string.rs
index 69a98b640..64c7054a1 100644
--- a/crates/ra_syntax/src/validation/byte_string.rs
+++ b/crates/ra_syntax/src/validation/byte_string.rs
@@ -1,10 +1,8 @@
 use crate::{
     ast::{self, AstNode, AstToken},
     string_lexing::{self, StringComponentKind},
-    syntax_node::{
-        SyntaxError,
-        SyntaxErrorKind::*,
-    },
+    SyntaxError,
+    SyntaxErrorKind::*,
 };
 
 use super::byte;
diff --git a/crates/ra_syntax/src/validation/char.rs b/crates/ra_syntax/src/validation/char.rs
index 26c15e36d..3169ed590 100644
--- a/crates/ra_syntax/src/validation/char.rs
+++ b/crates/ra_syntax/src/validation/char.rs
@@ -8,10 +8,8 @@ use crate::{
     ast::{self, AstNode, AstToken},
     string_lexing::{self, StringComponentKind},
     TextRange,
-    syntax_node::{
-        SyntaxError,
-        SyntaxErrorKind::*,
-    },
+    SyntaxError,
+    SyntaxErrorKind::*,
 };
 
 pub(super) fn validate_char_node(node: &ast::Char, errors: &mut Vec<SyntaxError>) {
diff --git a/crates/ra_syntax/src/validation/string.rs b/crates/ra_syntax/src/validation/string.rs
index 2f7f9c7c4..d857d088c 100644
--- a/crates/ra_syntax/src/validation/string.rs
+++ b/crates/ra_syntax/src/validation/string.rs
@@ -1,10 +1,8 @@
 use crate::{
     ast::{self, AstNode, AstToken},
     string_lexing,
-    syntax_node::{
-        SyntaxError,
-        SyntaxErrorKind::*,
-    },
+    SyntaxError,
+    SyntaxErrorKind::*,
 };
 
 use super::char;