diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-30 15:24:20 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-30 15:24:20 +0100 |
commit | 282702c2877e3f9002308b1b63fc472b5e799c56 (patch) | |
tree | e8ddcc0575b012ab6e8fd099746f571cc4bf304c /crates/ra_ide_db/src | |
parent | 323fd64abde2aced9427e4470b626a898b80a783 (diff) | |
parent | 6f8aa75329d0a4e588e58b8f22f7932bf3d3a706 (diff) |
Merge #5595
5595: Rename RecordLit -> RecordExpr r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide_db/src')
-rw-r--r-- | crates/ra_ide_db/src/defs.rs | 2 | ||||
-rw-r--r-- | crates/ra_ide_db/src/search.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_ide_db/src/defs.rs b/crates/ra_ide_db/src/defs.rs index 0e73a8932..6ea7f173b 100644 --- a/crates/ra_ide_db/src/defs.rs +++ b/crates/ra_ide_db/src/defs.rs | |||
@@ -236,7 +236,7 @@ pub fn classify_name_ref( | |||
236 | } | 236 | } |
237 | } | 237 | } |
238 | 238 | ||
239 | if let Some(record_field) = ast::RecordField::for_field_name(name_ref) { | 239 | if let Some(record_field) = ast::RecordExprField::for_field_name(name_ref) { |
240 | if let Some((field, local)) = sema.resolve_record_field(&record_field) { | 240 | if let Some((field, local)) = sema.resolve_record_field(&record_field) { |
241 | let field = Definition::Field(field); | 241 | let field = Definition::Field(field); |
242 | let res = match local { | 242 | let res = match local { |
diff --git a/crates/ra_ide_db/src/search.rs b/crates/ra_ide_db/src/search.rs index a7cae37b0..0b862b449 100644 --- a/crates/ra_ide_db/src/search.rs +++ b/crates/ra_ide_db/src/search.rs | |||
@@ -315,7 +315,7 @@ fn is_record_lit_name_ref(name_ref: &ast::NameRef) -> bool { | |||
315 | name_ref | 315 | name_ref |
316 | .syntax() | 316 | .syntax() |
317 | .ancestors() | 317 | .ancestors() |
318 | .find_map(ast::RecordLit::cast) | 318 | .find_map(ast::RecordExpr::cast) |
319 | .and_then(|l| l.path()) | 319 | .and_then(|l| l.path()) |
320 | .and_then(|p| p.segment()) | 320 | .and_then(|p| p.segment()) |
321 | .map(|p| p.name_ref().as_ref() == Some(name_ref)) | 321 | .map(|p| p.name_ref().as_ref() == Some(name_ref)) |