diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-04-02 08:50:09 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-04-02 08:50:09 +0100 |
commit | d21a677715196c46b73017acbae0105ef554284d (patch) | |
tree | 318d41ba567cf7ce1c5b4ead1857da64aa24242f /crates/ra_assists | |
parent | c2912892effbcf24d94da235b9ac0d2a7fccea5d (diff) | |
parent | 3f3ff2f0f4c188c606a96506325d96726c842239 (diff) |
Merge #1085
1085: add ast::tokens r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_assists')
-rw-r--r-- | crates/ra_assists/src/add_missing_impl_members.rs | 2 | ||||
-rw-r--r-- | crates/ra_assists/src/inline_local_variable.rs | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/crates/ra_assists/src/add_missing_impl_members.rs b/crates/ra_assists/src/add_missing_impl_members.rs index 5b01e898e..19a2d05bc 100644 --- a/crates/ra_assists/src/add_missing_impl_members.rs +++ b/crates/ra_assists/src/add_missing_impl_members.rs | |||
@@ -5,7 +5,7 @@ use crate::{Assist, AssistId, AssistCtx}; | |||
5 | use hir::Resolver; | 5 | use hir::Resolver; |
6 | use hir::db::HirDatabase; | 6 | use hir::db::HirDatabase; |
7 | use ra_syntax::{SmolStr, SyntaxKind, TextRange, TextUnit, TreeArc}; | 7 | use ra_syntax::{SmolStr, SyntaxKind, TextRange, TextUnit, TreeArc}; |
8 | use ra_syntax::ast::{self, AstNode, FnDef, ImplItem, ImplItemKind, NameOwner}; | 8 | use ra_syntax::ast::{self, AstNode, AstToken, FnDef, ImplItem, ImplItemKind, NameOwner}; |
9 | use ra_db::FilePosition; | 9 | use ra_db::FilePosition; |
10 | use ra_fmt::{leading_indent, reindent}; | 10 | use ra_fmt::{leading_indent, reindent}; |
11 | 11 | ||
diff --git a/crates/ra_assists/src/inline_local_variable.rs b/crates/ra_assists/src/inline_local_variable.rs index 0d7b884b8..950c2910b 100644 --- a/crates/ra_assists/src/inline_local_variable.rs +++ b/crates/ra_assists/src/inline_local_variable.rs | |||
@@ -1,14 +1,9 @@ | |||
1 | use hir::{ | 1 | use hir::{ |
2 | db::HirDatabase, | 2 | db::HirDatabase, |
3 | source_binder::function_from_child_node | 3 | source_binder::function_from_child_node, |
4 | }; | 4 | }; |
5 | use ra_syntax::{ | 5 | use ra_syntax::{ |
6 | ast::{ | 6 | ast::{self, AstNode, AstToken, PatKind, ExprKind}, |
7 | self, | ||
8 | AstNode, | ||
9 | PatKind, | ||
10 | ExprKind | ||
11 | }, | ||
12 | TextRange, | 7 | TextRange, |
13 | }; | 8 | }; |
14 | 9 | ||