diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-23 16:23:25 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-23 16:23:25 +0100 |
commit | 243b997df4dfc07910d38022828bc0f1d4745c57 (patch) | |
tree | c1b9181535611dbf7d92486d5f9cfc5ff81f8c94 /crates/ra_syntax/src | |
parent | 8df105b8b2061f33ed437a93ff72037a625f1a75 (diff) | |
parent | e2030405d5936911d99ef9854d9626122bf03a02 (diff) |
Merge #5506
5506: Rename modules r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_syntax/src')
-rw-r--r-- | crates/ra_syntax/src/ast.rs | 14 | ||||
-rw-r--r-- | crates/ra_syntax/src/ast/expr_ext.rs (renamed from crates/ra_syntax/src/ast/expr_extensions.rs) | 0 | ||||
-rw-r--r-- | crates/ra_syntax/src/ast/node_ext.rs (renamed from crates/ra_syntax/src/ast/extensions.rs) | 0 | ||||
-rw-r--r-- | crates/ra_syntax/src/ast/token_ext.rs (renamed from crates/ra_syntax/src/ast/tokens.rs) | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/crates/ra_syntax/src/ast.rs b/crates/ra_syntax/src/ast.rs index 9d02aeef3..c65c485cb 100644 --- a/crates/ra_syntax/src/ast.rs +++ b/crates/ra_syntax/src/ast.rs | |||
@@ -2,9 +2,9 @@ | |||
2 | 2 | ||
3 | mod generated; | 3 | mod generated; |
4 | mod traits; | 4 | mod traits; |
5 | mod tokens; | 5 | mod token_ext; |
6 | mod extensions; | 6 | mod node_ext; |
7 | mod expr_extensions; | 7 | mod expr_ext; |
8 | pub mod edit; | 8 | pub mod edit; |
9 | pub mod make; | 9 | pub mod make; |
10 | 10 | ||
@@ -16,13 +16,13 @@ use crate::{ | |||
16 | }; | 16 | }; |
17 | 17 | ||
18 | pub use self::{ | 18 | pub use self::{ |
19 | expr_extensions::{ArrayExprKind, BinOp, Effect, ElseBranch, LiteralKind, PrefixOp, RangeOp}, | 19 | expr_ext::{ArrayExprKind, BinOp, Effect, ElseBranch, LiteralKind, PrefixOp, RangeOp}, |
20 | extensions::{ | 20 | generated::{nodes::*, tokens::*}, |
21 | node_ext::{ | ||
21 | AttrKind, FieldKind, NameOrNameRef, PathSegmentKind, SelfParamKind, SlicePatComponents, | 22 | AttrKind, FieldKind, NameOrNameRef, PathSegmentKind, SelfParamKind, SlicePatComponents, |
22 | StructKind, TypeBoundKind, VisibilityKind, | 23 | StructKind, TypeBoundKind, VisibilityKind, |
23 | }, | 24 | }, |
24 | generated::{nodes::*, tokens::*}, | 25 | token_ext::*, |
25 | tokens::*, | ||
26 | traits::*, | 26 | traits::*, |
27 | }; | 27 | }; |
28 | 28 | ||
diff --git a/crates/ra_syntax/src/ast/expr_extensions.rs b/crates/ra_syntax/src/ast/expr_ext.rs index db5438d68..db5438d68 100644 --- a/crates/ra_syntax/src/ast/expr_extensions.rs +++ b/crates/ra_syntax/src/ast/expr_ext.rs | |||
diff --git a/crates/ra_syntax/src/ast/extensions.rs b/crates/ra_syntax/src/ast/node_ext.rs index 662c6f73e..662c6f73e 100644 --- a/crates/ra_syntax/src/ast/extensions.rs +++ b/crates/ra_syntax/src/ast/node_ext.rs | |||
diff --git a/crates/ra_syntax/src/ast/tokens.rs b/crates/ra_syntax/src/ast/token_ext.rs index 045f69133..c5ef92733 100644 --- a/crates/ra_syntax/src/ast/tokens.rs +++ b/crates/ra_syntax/src/ast/token_ext.rs | |||
@@ -5,11 +5,12 @@ use std::{ | |||
5 | convert::{TryFrom, TryInto}, | 5 | convert::{TryFrom, TryInto}, |
6 | }; | 6 | }; |
7 | 7 | ||
8 | use rustc_lexer::unescape::{unescape_literal, Mode}; | ||
9 | |||
8 | use crate::{ | 10 | use crate::{ |
9 | ast::{AstToken, Comment, RawString, String, Whitespace}, | 11 | ast::{AstToken, Comment, RawString, String, Whitespace}, |
10 | TextRange, TextSize, | 12 | TextRange, TextSize, |
11 | }; | 13 | }; |
12 | use rustc_lexer::unescape::{unescape_literal, Mode}; | ||
13 | 14 | ||
14 | impl Comment { | 15 | impl Comment { |
15 | pub fn kind(&self) -> CommentKind { | 16 | pub fn kind(&self) -> CommentKind { |