diff options
Diffstat (limited to 'crates/ra_syntax/src/ast')
-rw-r--r-- | crates/ra_syntax/src/ast/expr_extensions.rs | 6 | ||||
-rw-r--r-- | crates/ra_syntax/src/ast/extensions.rs | 6 | ||||
-rw-r--r-- | crates/ra_syntax/src/ast/tokens.rs | 6 | ||||
-rw-r--r-- | crates/ra_syntax/src/ast/traits.rs | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/crates/ra_syntax/src/ast/expr_extensions.rs b/crates/ra_syntax/src/ast/expr_extensions.rs index d88671d45..87dbb0ea5 100644 --- a/crates/ra_syntax/src/ast/expr_extensions.rs +++ b/crates/ra_syntax/src/ast/expr_extensions.rs | |||
@@ -1,10 +1,10 @@ | |||
1 | //! Various extension methods to ast Expr Nodes, which are hard to code-generate. | 1 | //! Various extension methods to ast Expr Nodes, which are hard to code-generate. |
2 | 2 | ||
3 | use crate::{ | 3 | use crate::{ |
4 | SyntaxToken, SyntaxElement, SmolStr, | 4 | ast::{self, child_opt, children, AstChildren, AstNode}, |
5 | ast::{self, AstNode, AstChildren, children, child_opt}, | 5 | SmolStr, SyntaxElement, |
6 | SyntaxKind::*, | 6 | SyntaxKind::*, |
7 | T | 7 | SyntaxToken, T, |
8 | }; | 8 | }; |
9 | 9 | ||
10 | #[derive(Debug, Clone, PartialEq, Eq)] | 10 | #[derive(Debug, Clone, PartialEq, Eq)] |
diff --git a/crates/ra_syntax/src/ast/extensions.rs b/crates/ra_syntax/src/ast/extensions.rs index 930b2d9fa..72a30232d 100644 --- a/crates/ra_syntax/src/ast/extensions.rs +++ b/crates/ra_syntax/src/ast/extensions.rs | |||
@@ -4,10 +4,10 @@ | |||
4 | use itertools::Itertools; | 4 | use itertools::Itertools; |
5 | 5 | ||
6 | use crate::{ | 6 | use crate::{ |
7 | SmolStr, SyntaxToken, | 7 | ast::{self, child_opt, children, AstNode}, |
8 | ast::{self, AstNode, children, child_opt}, | 8 | SmolStr, SyntaxElement, |
9 | SyntaxKind::*, | 9 | SyntaxKind::*, |
10 | SyntaxElement, T, | 10 | SyntaxToken, T, |
11 | }; | 11 | }; |
12 | use ra_parser::SyntaxKind; | 12 | use ra_parser::SyntaxKind; |
13 | 13 | ||
diff --git a/crates/ra_syntax/src/ast/tokens.rs b/crates/ra_syntax/src/ast/tokens.rs index 08882ea69..be63b3c9e 100644 --- a/crates/ra_syntax/src/ast/tokens.rs +++ b/crates/ra_syntax/src/ast/tokens.rs | |||
@@ -1,9 +1,9 @@ | |||
1 | //! There are many AstNodes, but only a few tokens, so we hand-write them here. | 1 | //! There are many AstNodes, but only a few tokens, so we hand-write them here. |
2 | 2 | ||
3 | use crate::{ | 3 | use crate::{ |
4 | SyntaxToken, | ||
5 | SyntaxKind::{COMMENT, WHITESPACE}, | ||
6 | ast::AstToken, | 4 | ast::AstToken, |
5 | SyntaxKind::{COMMENT, WHITESPACE}, | ||
6 | SyntaxToken, | ||
7 | }; | 7 | }; |
8 | 8 | ||
9 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | 9 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] |
@@ -61,7 +61,7 @@ pub enum CommentPlacement { | |||
61 | } | 61 | } |
62 | 62 | ||
63 | const COMMENT_PREFIX_TO_KIND: &[(&str, CommentKind)] = { | 63 | const COMMENT_PREFIX_TO_KIND: &[(&str, CommentKind)] = { |
64 | use {CommentShape::*, CommentPlacement::*}; | 64 | use {CommentPlacement::*, CommentShape::*}; |
65 | &[ | 65 | &[ |
66 | ("///", CommentKind { shape: Line, doc: Some(Outer) }), | 66 | ("///", CommentKind { shape: Line, doc: Some(Outer) }), |
67 | ("//!", CommentKind { shape: Line, doc: Some(Inner) }), | 67 | ("//!", CommentKind { shape: Line, doc: Some(Inner) }), |
diff --git a/crates/ra_syntax/src/ast/traits.rs b/crates/ra_syntax/src/ast/traits.rs index 433485400..29cb53e35 100644 --- a/crates/ra_syntax/src/ast/traits.rs +++ b/crates/ra_syntax/src/ast/traits.rs | |||
@@ -5,8 +5,8 @@ | |||
5 | use itertools::Itertools; | 5 | use itertools::Itertools; |
6 | 6 | ||
7 | use crate::{ | 7 | use crate::{ |
8 | syntax_node::{SyntaxNodeChildren, SyntaxElementChildren}, | 8 | ast::{self, child_opt, children, AstChildren, AstNode, AstToken}, |
9 | ast::{self, child_opt, children, AstNode, AstToken, AstChildren}, | 9 | syntax_node::{SyntaxElementChildren, SyntaxNodeChildren}, |
10 | }; | 10 | }; |
11 | 11 | ||
12 | pub trait TypeAscriptionOwner: AstNode { | 12 | pub trait TypeAscriptionOwner: AstNode { |