From e2030405d5936911d99ef9854d9626122bf03a02 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 23 Jul 2020 17:23:01 +0200 Subject: [PATCH] Rename modules --- crates/ra_syntax/src/ast.rs | 14 +++++++------- .../src/ast/{expr_extensions.rs => expr_ext.rs} | 0 .../src/ast/{extensions.rs => node_ext.rs} | 0 .../ra_syntax/src/ast/{tokens.rs => token_ext.rs} | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) rename crates/ra_syntax/src/ast/{expr_extensions.rs => expr_ext.rs} (100%) rename crates/ra_syntax/src/ast/{extensions.rs => node_ext.rs} (100%) rename crates/ra_syntax/src/ast/{tokens.rs => token_ext.rs} (99%) diff --git a/crates/ra_syntax/src/ast.rs b/crates/ra_syntax/src/ast.rs index 9d02aeef3f..c65c485cb9 100644 --- a/crates/ra_syntax/src/ast.rs +++ b/crates/ra_syntax/src/ast.rs @@ -2,9 +2,9 @@ mod generated; mod traits; -mod tokens; -mod extensions; -mod expr_extensions; +mod token_ext; +mod node_ext; +mod expr_ext; pub mod edit; pub mod make; @@ -16,13 +16,13 @@ use crate::{ }; pub use self::{ - expr_extensions::{ArrayExprKind, BinOp, Effect, ElseBranch, LiteralKind, PrefixOp, RangeOp}, - extensions::{ + expr_ext::{ArrayExprKind, BinOp, Effect, ElseBranch, LiteralKind, PrefixOp, RangeOp}, + generated::{nodes::*, tokens::*}, + node_ext::{ AttrKind, FieldKind, NameOrNameRef, PathSegmentKind, SelfParamKind, SlicePatComponents, StructKind, TypeBoundKind, VisibilityKind, }, - generated::{nodes::*, tokens::*}, - tokens::*, + token_ext::*, traits::*, }; diff --git a/crates/ra_syntax/src/ast/expr_extensions.rs b/crates/ra_syntax/src/ast/expr_ext.rs similarity index 100% rename from crates/ra_syntax/src/ast/expr_extensions.rs rename to 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 similarity index 100% rename from crates/ra_syntax/src/ast/extensions.rs rename to 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 similarity index 99% rename from crates/ra_syntax/src/ast/tokens.rs rename to crates/ra_syntax/src/ast/token_ext.rs index 045f691333..c5ef92733d 100644 --- a/crates/ra_syntax/src/ast/tokens.rs +++ b/crates/ra_syntax/src/ast/token_ext.rs @@ -5,11 +5,12 @@ use std::{ convert::{TryFrom, TryInto}, }; +use rustc_lexer::unescape::{unescape_literal, Mode}; + use crate::{ ast::{AstToken, Comment, RawString, String, Whitespace}, TextRange, TextSize, }; -use rustc_lexer::unescape::{unescape_literal, Mode}; impl Comment { pub fn kind(&self) -> CommentKind {