From b53587c7bdd67c63bd33a745fdaeb22a847b6c2f Mon Sep 17 00:00:00 2001
From: Edwin Cheng <edwin0cheng@gmail.com>
Date: Sun, 15 Dec 2019 01:46:39 +0800
Subject: Re-export Origin to replace ExpansionOrigin

---
 crates/ra_hir_expand/src/lib.rs | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'crates/ra_hir_expand')

diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs
index d1a43fe6c..cb4e1950b 100644
--- a/crates/ra_hir_expand/src/lib.rs
+++ b/crates/ra_hir_expand/src/lib.rs
@@ -214,11 +214,7 @@ pub struct ExpansionInfo {
     exp_map: Arc<mbe::TokenMap>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ExpansionOrigin {
-    Call,
-    Def,
-}
+pub use mbe::Origin;
 
 impl ExpansionInfo {
     pub fn call_node(&self) -> Option<InFile<SyntaxNode>> {
@@ -241,17 +237,15 @@ impl ExpansionInfo {
     pub fn map_token_up(
         &self,
         token: InFile<&SyntaxToken>,
-    ) -> Option<(InFile<SyntaxToken>, ExpansionOrigin)> {
+    ) -> Option<(InFile<SyntaxToken>, Origin)> {
         let token_id = self.exp_map.token_by_range(token.value.text_range())?;
 
         let (token_id, origin) = self.macro_def.0.map_id_up(token_id);
-        let (token_map, tt, origin) = match origin {
-            mbe::Origin::Call => (&self.macro_arg.1, self.arg.clone(), ExpansionOrigin::Call),
-            mbe::Origin::Def => (
-                &self.macro_def.1,
-                self.def.as_ref().map(|tt| tt.syntax().clone()),
-                ExpansionOrigin::Def,
-            ),
+        let (token_map, tt) = match origin {
+            mbe::Origin::Call => (&self.macro_arg.1, self.arg.clone()),
+            mbe::Origin::Def => {
+                (&self.macro_def.1, self.def.as_ref().map(|tt| tt.syntax().clone()))
+            }
         };
 
         let range = token_map.range_by_token(token_id)?;
-- 
cgit v1.2.3