rust-analyzer

Unnamed repository; edit this file 'description' to name the repository.

Clone

HTTPS

SSH

Diffstat (limited to 'crates/hir-expand/src/lib.rs')

-rw-r--r--

1 files changed, 2 insertions, 5 deletions

diff --git a/crates/hir-expand/src/lib.rs b/crates/hir-expand/src/lib.rs
index 020ca75d80..42dc8c12d6 100644
--- a/crates/hir-expand/src/lib.rs
+++ b/crates/hir-expand/src/lib.rs

@@ -6,7 +6,6 @@

#![warn(rust_2018_idioms, unused_lifetimes)]

-pub mod ast_id_map;

pub mod attrs;

pub mod builtin_attr_macro;

pub mod builtin_derive_macro;

@@ -32,7 +31,7 @@ use std::{fmt, hash::Hash};

use base_db::{salsa::impl_intern_value_trivial, CrateId, Edition, FileId};

use either::Either;

-use span::{FileRange, HirFileIdRepr, Span, SyntaxContextId};

+use span::{ErasedFileAstId, FileRange, HirFileIdRepr, Span, SyntaxContextData, SyntaxContextId};

use syntax::{

ast::{self, AstNode},

SyntaxNode, SyntaxToken, TextRange, TextSize,

@@ -44,14 +43,12 @@ use crate::{

builtin_derive_macro::BuiltinDeriveExpander,

builtin_fn_macro::{BuiltinFnLikeExpander, EagerExpander},

db::{ExpandDatabase, TokenExpander},

- hygiene::SyntaxContextData,

mod_path::ModPath,

proc_macro::{CustomProcMacroExpander, ProcMacroKind},

span_map::{ExpansionSpanMap, SpanMap},

};

-pub use crate::ast_id_map::{AstId, ErasedAstId, ErasedFileAstId};

-pub use crate::files::{InFile, InMacroFile, InRealFile};

+pub use crate::files::{AstId, ErasedAstId, InFile, InMacroFile, InRealFile};

pub use mbe::ValueResult;

pub use span::{HirFileId, MacroCallId, MacroFileId};