diff options
author | Alan Du <[email protected]> | 2018-10-22 15:50:55 +0100 |
---|---|---|
committer | Alan Du <[email protected]> | 2018-10-22 15:50:55 +0100 |
commit | dc9ce8ff7494f641c7102785cdef95489f2fc3d6 (patch) | |
tree | 04b491be95b46270f6cbb1004cff348fbbdc15ff | |
parent | 0857c22f263ff18418f939b57a7a2ab3f8aac2c1 (diff) |
Rename new to new_item (to match new_impl)
-rw-r--r-- | crates/ra_editor/src/scope/mod_scope.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crates/ra_editor/src/scope/mod_scope.rs b/crates/ra_editor/src/scope/mod_scope.rs index 8d7e408f8..956ee0e2f 100644 --- a/crates/ra_editor/src/scope/mod_scope.rs +++ b/crates/ra_editor/src/scope/mod_scope.rs | |||
@@ -22,14 +22,14 @@ impl ModuleScope { | |||
22 | let mut entries = Vec::new(); | 22 | let mut entries = Vec::new(); |
23 | for item in items { | 23 | for item in items { |
24 | let entry = match item { | 24 | let entry = match item { |
25 | ast::ModuleItem::StructDef(item) => Entry::new(item), | 25 | ast::ModuleItem::StructDef(item) => Entry::new_item(item), |
26 | ast::ModuleItem::EnumDef(item) => Entry::new(item), | 26 | ast::ModuleItem::EnumDef(item) => Entry::new_item(item), |
27 | ast::ModuleItem::FnDef(item) => Entry::new(item), | 27 | ast::ModuleItem::FnDef(item) => Entry::new_item(item), |
28 | ast::ModuleItem::ConstDef(item) => Entry::new(item), | 28 | ast::ModuleItem::ConstDef(item) => Entry::new_item(item), |
29 | ast::ModuleItem::StaticDef(item) => Entry::new(item), | 29 | ast::ModuleItem::StaticDef(item) => Entry::new_item(item), |
30 | ast::ModuleItem::TraitDef(item) => Entry::new(item), | 30 | ast::ModuleItem::TraitDef(item) => Entry::new_item(item), |
31 | ast::ModuleItem::TypeDef(item) => Entry::new(item), | 31 | ast::ModuleItem::TypeDef(item) => Entry::new_item(item), |
32 | ast::ModuleItem::Module(item) => Entry::new(item), | 32 | ast::ModuleItem::Module(item) => Entry::new_item(item), |
33 | ast::ModuleItem::UseItem(item) => { | 33 | ast::ModuleItem::UseItem(item) => { |
34 | if let Some(tree) = item.use_tree() { | 34 | if let Some(tree) = item.use_tree() { |
35 | collect_imports(tree, &mut entries); | 35 | collect_imports(tree, &mut entries); |
@@ -50,7 +50,7 @@ impl ModuleScope { | |||
50 | } | 50 | } |
51 | 51 | ||
52 | impl Entry { | 52 | impl Entry { |
53 | fn new<'a>(item: impl ast::NameOwner<'a>) -> Option<Entry> { | 53 | fn new_item<'a>(item: impl ast::NameOwner<'a>) -> Option<Entry> { |
54 | let name = item.name()?; | 54 | let name = item.name()?; |
55 | Some(Entry { | 55 | Some(Entry { |
56 | node: name.syntax().owned(), | 56 | node: name.syntax().owned(), |