language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 06:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Re-export Origin to replace ExpansionOrigin

Browse source
This commit is contained in:
Edwin Cheng 2019-12-15 01:46:39 +08:00
parent 61360fdfec
commit b53587c7bd
4 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_ide/src/expand.rs
View file

@ -1,7 +1,7 @@
//! Utilities to work with files, produced by macros.
use std::iter::successors;
use hir::{ExpansionOrigin, InFile};
use hir::{InFile, Origin};
use ra_db::FileId;
use ra_syntax::{ast, AstNode, SyntaxNode, SyntaxToken, TextRange};
@ -45,7 +45,7 @@ pub(crate) fn original_range_by_kind(
if first.file_id != last.file_id
|| first_origin != last_origin
|| (kind == OriginalRangeKind::CallToken && first_origin != ExpansionOrigin::Call)
|| (kind == OriginalRangeKind::CallToken && first_origin != Origin::Call)
{
return None;
}