aboutsummaryrefslogtreecommitdiff
path: root/crates/ide
diff options
context:
space:
mode:
authorJonas Schievink <[email protected]>2020-11-26 15:48:17 +0000
committerJonas Schievink <[email protected]>2020-11-26 15:48:17 +0000
commit6a9338e979ed90d2c0342db2d489c37bebb62ce7 (patch)
tree260c5811fb59578cf44ff0929c4aab8b4f1773ce /crates/ide
parent1542797284f5d3ea51d4e44c5c3c0c673d22d79a (diff)
Use `ExpandResult` instead of `MacroResult`
`MacroResult` is redundant
Diffstat (limited to 'crates/ide')
-rw-r--r--crates/ide/src/status.rs6
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 @@
1use std::{fmt, iter::FromIterator, sync::Arc}; 1use std::{fmt, iter::FromIterator, sync::Arc};
2 2
3use hir::{MacroFile, MacroResult}; 3use hir::{ExpandResult, MacroFile};
4use ide_db::base_db::{ 4use 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
118impl<M> FromIterator<TableEntry<MacroFile, MacroResult<(Parse<SyntaxNode>, M)>>> 118impl<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 {