diff options
author | Benjamin Coenen <[email protected]> | 2020-05-10 11:31:55 +0100 |
---|---|---|
committer | Benjamin Coenen <[email protected]> | 2020-05-10 11:31:55 +0100 |
commit | e80903a96564c2239489a8c630a4748bf21a3659 (patch) | |
tree | 12b31a1fd12deb2120065cea5a558425c8c1984f /crates/ra_ide/src/lib.rs | |
parent | 6203e9c4faee288f16d93dbb7dd0f1f8df487d83 (diff) | |
parent | 4578154b608fa075595103d0c933da60d55b25c8 (diff) |
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer into feat_4348
Diffstat (limited to 'crates/ra_ide/src/lib.rs')
-rw-r--r-- | crates/ra_ide/src/lib.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs index 737f87109..915199bd8 100644 --- a/crates/ra_ide/src/lib.rs +++ b/crates/ra_ide/src/lib.rs | |||
@@ -472,12 +472,12 @@ impl Analysis { | |||
472 | /// position. | 472 | /// position. |
473 | pub fn assists(&self, frange: FileRange) -> Cancelable<Vec<Assist>> { | 473 | pub fn assists(&self, frange: FileRange) -> Cancelable<Vec<Assist>> { |
474 | self.with_db(|db| { | 474 | self.with_db(|db| { |
475 | ra_assists::resolved_assists(db, frange) | 475 | ra_assists::Assist::resolved(db, frange) |
476 | .into_iter() | 476 | .into_iter() |
477 | .map(|assist| Assist { | 477 | .map(|assist| Assist { |
478 | id: assist.label.id, | 478 | id: assist.assist.id, |
479 | label: assist.label.label, | 479 | label: assist.assist.label, |
480 | group_label: assist.label.group.map(|it| it.0), | 480 | group_label: assist.assist.group.map(|it| it.0), |
481 | source_change: assist.source_change, | 481 | source_change: assist.source_change, |
482 | }) | 482 | }) |
483 | .collect() | 483 | .collect() |