diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-11-26 15:48:58 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-11-26 15:48:58 +0000 |
| commit | db061fb274ddc9a8820c5f0c90b077c88961d1be (patch) | |
| tree | 260c5811fb59578cf44ff0929c4aab8b4f1773ce /crates/ide | |
| parent | 1542797284f5d3ea51d4e44c5c3c0c673d22d79a (diff) | |
| parent | 6a9338e979ed90d2c0342db2d489c37bebb62ce7 (diff) | |
Merge #6639
6639: Use `ExpandResult` instead of `MacroResult` r=jonas-schievink a=jonas-schievink
`MacroResult` is redundant.
bors r+ :robot:
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/ide')
| -rw-r--r-- | crates/ide/src/status.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ide/src/status.rs b/crates/ide/src/status.rs index b75f88ed9..e10d7c3a4 100644 --- a/crates/ide/src/status.rs +++ b/crates/ide/src/status.rs | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | use std::{fmt, iter::FromIterator, sync::Arc}; | 1 | use std::{fmt, iter::FromIterator, sync::Arc}; |
| 2 | 2 | ||
| 3 | use hir::{MacroFile, MacroResult}; | 3 | use hir::{ExpandResult, MacroFile}; |
| 4 | use ide_db::base_db::{ | 4 | use ide_db::base_db::{ |
| 5 | salsa::debug::{DebugQueryTable, TableEntry}, | 5 | salsa::debug::{DebugQueryTable, TableEntry}, |
| 6 | CrateId, FileId, FileTextQuery, SourceDatabase, SourceRootId, | 6 | CrateId, FileId, FileTextQuery, SourceDatabase, SourceRootId, |
| @@ -115,12 +115,12 @@ impl FromIterator<TableEntry<FileId, Parse<ast::SourceFile>>> for SyntaxTreeStat | |||
| 115 | } | 115 | } |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | impl<M> FromIterator<TableEntry<MacroFile, MacroResult<(Parse<SyntaxNode>, M)>>> | 118 | impl<M> FromIterator<TableEntry<MacroFile, ExpandResult<Option<(Parse<SyntaxNode>, M)>>>> |
| 119 | for SyntaxTreeStats | 119 | for SyntaxTreeStats |
| 120 | { | 120 | { |
| 121 | fn from_iter<T>(iter: T) -> SyntaxTreeStats | 121 | fn from_iter<T>(iter: T) -> SyntaxTreeStats |
| 122 | where | 122 | where |
| 123 | T: IntoIterator<Item = TableEntry<MacroFile, MacroResult<(Parse<SyntaxNode>, M)>>>, | 123 | T: IntoIterator<Item = TableEntry<MacroFile, ExpandResult<Option<(Parse<SyntaxNode>, M)>>>>, |
| 124 | { | 124 | { |
| 125 | let mut res = SyntaxTreeStats::default(); | 125 | let mut res = SyntaxTreeStats::default(); |
| 126 | for entry in iter { | 126 | for entry in iter { |