diff options
| -rw-r--r-- | crates/hir_def/src/macro_expansion_tests.rs | 2 | ||||
| -rw-r--r-- | crates/hir_def/src/macro_expansion_tests/builtin_fn_macro.rs (renamed from crates/hir_def/src/macro_expansion_tests/builtin.rs) | 0 | ||||
| -rw-r--r-- | crates/hir_def/src/nameres/collector.rs | 6 | ||||
| -rw-r--r-- | crates/hir_expand/src/builtin_attr_macro.rs (renamed from crates/hir_expand/src/builtin_attr.rs) | 0 | ||||
| -rw-r--r-- | crates/hir_expand/src/builtin_derive_macro.rs (renamed from crates/hir_expand/src/builtin_derive.rs) | 0 | ||||
| -rw-r--r-- | crates/hir_expand/src/builtin_fn_macro.rs (renamed from crates/hir_expand/src/builtin_macro.rs) | 0 | ||||
| -rw-r--r-- | crates/hir_expand/src/lib.rs | 12 |
7 files changed, 10 insertions, 10 deletions
diff --git a/crates/hir_def/src/macro_expansion_tests.rs b/crates/hir_def/src/macro_expansion_tests.rs index c317dc27a58..f29d1443b92 100644 --- a/crates/hir_def/src/macro_expansion_tests.rs +++ b/crates/hir_def/src/macro_expansion_tests.rs @@ -10,7 +10,7 @@ //! and harder to understand. mod mbe; -mod builtin; +mod builtin_fn_macro; use std::{iter, ops::Range}; diff --git a/crates/hir_def/src/macro_expansion_tests/builtin.rs b/crates/hir_def/src/macro_expansion_tests/builtin_fn_macro.rs index 6982116522c..6982116522c 100644 --- a/crates/hir_def/src/macro_expansion_tests/builtin.rs +++ b/crates/hir_def/src/macro_expansion_tests/builtin_fn_macro.rs diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs index dbd4378968c..d1cc61e235f 100644 --- a/crates/hir_def/src/nameres/collector.rs +++ b/crates/hir_def/src/nameres/collector.rs @@ -9,9 +9,9 @@ use base_db::{CrateId, Edition, FileId, ProcMacroId}; use cfg::{CfgExpr, CfgOptions}; use hir_expand::{ ast_id_map::FileAstId, - builtin_attr::find_builtin_attr, - builtin_derive::find_builtin_derive, - builtin_macro::find_builtin_macro, + builtin_attr_macro::find_builtin_attr, + builtin_derive_macro::find_builtin_derive, + builtin_fn_macro::find_builtin_macro, name::{name, AsName, Name}, proc_macro::ProcMacroExpander, ExpandTo, HirFileId, MacroCallId, MacroCallKind, MacroDefId, MacroDefKind, diff --git a/crates/hir_expand/src/builtin_attr.rs b/crates/hir_expand/src/builtin_attr_macro.rs index 2e461864a0b..2e461864a0b 100644 --- a/crates/hir_expand/src/builtin_attr.rs +++ b/crates/hir_expand/src/builtin_attr_macro.rs diff --git a/crates/hir_expand/src/builtin_derive.rs b/crates/hir_expand/src/builtin_derive_macro.rs index eeebe87acd6..eeebe87acd6 100644 --- a/crates/hir_expand/src/builtin_derive.rs +++ b/crates/hir_expand/src/builtin_derive_macro.rs diff --git a/crates/hir_expand/src/builtin_macro.rs b/crates/hir_expand/src/builtin_fn_macro.rs index 4b801eb2a15..4b801eb2a15 100644 --- a/crates/hir_expand/src/builtin_macro.rs +++ b/crates/hir_expand/src/builtin_fn_macro.rs diff --git a/crates/hir_expand/src/lib.rs b/crates/hir_expand/src/lib.rs index ad6b84dd17e..de32d02415d 100644 --- a/crates/hir_expand/src/lib.rs +++ b/crates/hir_expand/src/lib.rs @@ -8,9 +8,9 @@ pub mod db; pub mod ast_id_map; pub mod name; pub mod hygiene; -pub mod builtin_attr; -pub mod builtin_derive; -pub mod builtin_macro; +pub mod builtin_attr_macro; +pub mod builtin_derive_macro; +pub mod builtin_fn_macro; pub mod proc_macro; pub mod quote; pub mod eager; @@ -31,9 +31,9 @@ use syntax::{ use crate::{ ast_id_map::FileAstId, - builtin_attr::BuiltinAttrExpander, - builtin_derive::BuiltinDeriveExpander, - builtin_macro::{BuiltinFnLikeExpander, EagerExpander}, + builtin_attr_macro::BuiltinAttrExpander, + builtin_derive_macro::BuiltinDeriveExpander, + builtin_fn_macro::{BuiltinFnLikeExpander, EagerExpander}, db::TokenExpander, proc_macro::ProcMacroExpander, }; |