From 604bdc6ffeea69dffed6d03f10b2fd4e05d04cda Mon Sep 17 00:00:00 2001 From: Edwin Cheng Date: Tue, 5 Nov 2019 02:09:16 +0800 Subject: Use macro_rules shift to map text ranges --- crates/ra_tt/src/lib.rs | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'crates/ra_tt/src') diff --git a/crates/ra_tt/src/lib.rs b/crates/ra_tt/src/lib.rs index 1449618f3..20c251ff4 100644 --- a/crates/ra_tt/src/lib.rs +++ b/crates/ra_tt/src/lib.rs @@ -25,26 +25,11 @@ use smol_str::SmolStr; /// source token and making sure that identities are preserved during macro /// expansion. #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] -pub struct TokenId { - token_id: u32, - map_id: u32, -} +pub struct TokenId(pub u32); impl TokenId { - pub fn new(token_id: u32, map_id: u32) -> TokenId { - TokenId { token_id, map_id } - } - pub const fn unspecified() -> TokenId { - TokenId { token_id: !0, map_id: !0 } - } - - pub fn token_id(&self) -> u32 { - self.token_id - } - - pub fn map_id(&self) -> u32 { - self.map_id + TokenId(!0) } } -- cgit v1.2.3