diff options
author | Benjamin Coenen <[email protected]> | 2020-04-07 16:59:09 +0100 |
---|---|---|
committer | Benjamin Coenen <[email protected]> | 2020-04-07 16:59:09 +0100 |
commit | 18a5e164838e1dc2abcc6b79d4fc2f96ffd2507c (patch) | |
tree | bc80b5c49c3b7ba31c7fe967bb34fe14bac9d5ed /crates/ra_ide_db/src | |
parent | ab864ed259c10ff51f7c9c3421d098eeea7b0245 (diff) | |
parent | 33c364b545350134b945fbca834194fd1a28fe08 (diff) |
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer
Diffstat (limited to 'crates/ra_ide_db/src')
-rw-r--r-- | crates/ra_ide_db/src/search.rs | 2 | ||||
-rw-r--r-- | crates/ra_ide_db/src/symbol_index.rs | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/crates/ra_ide_db/src/search.rs b/crates/ra_ide_db/src/search.rs index 05a0eed30..1bf014149 100644 --- a/crates/ra_ide_db/src/search.rs +++ b/crates/ra_ide_db/src/search.rs | |||
@@ -286,7 +286,7 @@ fn reference_access(def: &Definition, name_ref: &ast::NameRef) -> Option<Referen | |||
286 | } | 286 | } |
287 | Some(ReferenceAccess::Read) | 287 | Some(ReferenceAccess::Read) |
288 | }, | 288 | }, |
289 | _ => {None} | 289 | _ => None |
290 | } | 290 | } |
291 | } | 291 | } |
292 | }); | 292 | }); |
diff --git a/crates/ra_ide_db/src/symbol_index.rs b/crates/ra_ide_db/src/symbol_index.rs index 0f46f93c1..d30458d86 100644 --- a/crates/ra_ide_db/src/symbol_index.rs +++ b/crates/ra_ide_db/src/symbol_index.rs | |||
@@ -354,14 +354,14 @@ fn to_symbol(node: &SyntaxNode) -> Option<(SmolStr, SyntaxNodePtr, TextRange)> { | |||
354 | } | 354 | } |
355 | match_ast! { | 355 | match_ast! { |
356 | match node { | 356 | match node { |
357 | ast::FnDef(it) => { decl(it) }, | 357 | ast::FnDef(it) => decl(it), |
358 | ast::StructDef(it) => { decl(it) }, | 358 | ast::StructDef(it) => decl(it), |
359 | ast::EnumDef(it) => { decl(it) }, | 359 | ast::EnumDef(it) => decl(it), |
360 | ast::TraitDef(it) => { decl(it) }, | 360 | ast::TraitDef(it) => decl(it), |
361 | ast::Module(it) => { decl(it) }, | 361 | ast::Module(it) => decl(it), |
362 | ast::TypeAliasDef(it) => { decl(it) }, | 362 | ast::TypeAliasDef(it) => decl(it), |
363 | ast::ConstDef(it) => { decl(it) }, | 363 | ast::ConstDef(it) => decl(it), |
364 | ast::StaticDef(it) => { decl(it) }, | 364 | ast::StaticDef(it) => decl(it), |
365 | ast::MacroCall(it) => { | 365 | ast::MacroCall(it) => { |
366 | if it.is_macro_rules().is_some() { | 366 | if it.is_macro_rules().is_some() { |
367 | decl(it) | 367 | decl(it) |