diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-21 14:48:46 +0100 |
|---|---|---|
| committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-21 14:48:46 +0100 |
| commit | 443061e75260e55bbaa741c5c85377b8d5c57e47 (patch) | |
| tree | c28241dc1639480ba5154040e9f31384eabfed06 /crates/ra_hir/src/ty | |
| parent | 1137fc47bbbc8d648db3bc669e41fd059a09dd1d (diff) | |
| parent | 773ad2edb3b84bf20378a577bc4cd808384de078 (diff) | |
Merge #1570
1570: switch to upstream rowan's API r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty')
| -rw-r--r-- | crates/ra_hir/src/ty/tests.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs index 706500484..676711d0a 100644 --- a/crates/ra_hir/src/ty/tests.rs +++ b/crates/ra_hir/src/ty/tests.rs | |||
| @@ -3211,8 +3211,7 @@ fn typing_whitespace_inside_a_function_should_not_invalidate_types() { | |||
| 3211 | ); | 3211 | ); |
| 3212 | { | 3212 | { |
| 3213 | let file = db.parse(pos.file_id).ok().unwrap(); | 3213 | let file = db.parse(pos.file_id).ok().unwrap(); |
| 3214 | let node = | 3214 | let node = file.syntax().token_at_offset(pos.offset).right_biased().unwrap().parent(); |
| 3215 | algo::find_token_at_offset(file.syntax(), pos.offset).right_biased().unwrap().parent(); | ||
| 3216 | let events = db.log_executed(|| { | 3215 | let events = db.log_executed(|| { |
| 3217 | SourceAnalyzer::new(&db, pos.file_id, &node, None); | 3216 | SourceAnalyzer::new(&db, pos.file_id, &node, None); |
| 3218 | }); | 3217 | }); |
| @@ -3232,8 +3231,7 @@ fn typing_whitespace_inside_a_function_should_not_invalidate_types() { | |||
| 3232 | 3231 | ||
| 3233 | { | 3232 | { |
| 3234 | let file = db.parse(pos.file_id).ok().unwrap(); | 3233 | let file = db.parse(pos.file_id).ok().unwrap(); |
| 3235 | let node = | 3234 | let node = file.syntax().token_at_offset(pos.offset).right_biased().unwrap().parent(); |
| 3236 | algo::find_token_at_offset(file.syntax(), pos.offset).right_biased().unwrap().parent(); | ||
| 3237 | let events = db.log_executed(|| { | 3235 | let events = db.log_executed(|| { |
| 3238 | SourceAnalyzer::new(&db, pos.file_id, &node, None); | 3236 | SourceAnalyzer::new(&db, pos.file_id, &node, None); |
| 3239 | }); | 3237 | }); |