squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #10509

Browse source 
10509: internal: consistent module naming r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2021-10-10 12:44:39 +00:00 committed by GitHub
commit 4ff0377ed0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/hir_def/src/macro_expansion_tests.rs
View file

@ -10,7 +10,7 @@
//! and harder to understand. //! and harder to understand.
mod mbe; mod mbe;
mod builtin; mod builtin_fn_macro;
use std::{iter, ops::Range}; use std::{iter, ops::Range};

0
crates/hir_def/src/macro_expansion_tests/builtin.rs → crates/hir_def/src/macro_expansion_tests/builtin_fn_macro.rs
View file

6
crates/hir_def/src/nameres/collector.rs
View file

@ -9,9 +9,9 @@ use base_db::{CrateId, Edition, FileId, ProcMacroId};
use cfg::{CfgExpr, CfgOptions}; use cfg::{CfgExpr, CfgOptions};
use hir_expand::{ use hir_expand::{
ast_id_map::FileAstId, ast_id_map::FileAstId,
builtin_attr::find_builtin_attr, builtin_attr_macro::find_builtin_attr,
builtin_derive::find_builtin_derive, builtin_derive_macro::find_builtin_derive,
builtin_macro::find_builtin_macro, builtin_fn_macro::find_builtin_macro,
name::{name, AsName, Name}, name::{name, AsName, Name},
proc_macro::ProcMacroExpander, proc_macro::ProcMacroExpander,
ExpandTo, HirFileId, MacroCallId, MacroCallKind, MacroDefId, MacroDefKind, ExpandTo, HirFileId, MacroCallId, MacroCallKind, MacroDefId, MacroDefKind,

0
crates/hir_expand/src/builtin_attr.rs → crates/hir_expand/src/builtin_attr_macro.rs
View file

0
crates/hir_expand/src/builtin_derive.rs → crates/hir_expand/src/builtin_derive_macro.rs
View file

0
crates/hir_expand/src/builtin_macro.rs → crates/hir_expand/src/builtin_fn_macro.rs
View file

12
crates/hir_expand/src/lib.rs
View file

@ -8,9 +8,9 @@ pub mod db;
pub mod ast_id_map; pub mod ast_id_map;
pub mod name; pub mod name;
pub mod hygiene; pub mod hygiene;
pub mod builtin_attr; pub mod builtin_attr_macro;
pub mod builtin_derive; pub mod builtin_derive_macro;
pub mod builtin_macro; pub mod builtin_fn_macro;
pub mod proc_macro; pub mod proc_macro;
pub mod quote; pub mod quote;
pub mod eager; pub mod eager;
@ -31,9 +31,9 @@ use syntax::{
use crate::{ use crate::{
ast_id_map::FileAstId, ast_id_map::FileAstId,
builtin_attr::BuiltinAttrExpander, builtin_attr_macro::BuiltinAttrExpander,
builtin_derive::BuiltinDeriveExpander, builtin_derive_macro::BuiltinDeriveExpander,
builtin_macro::{BuiltinFnLikeExpander, EagerExpander}, builtin_fn_macro::{BuiltinFnLikeExpander, EagerExpander},
db::TokenExpander, db::TokenExpander,
proc_macro::ProcMacroExpander, proc_macro::ProcMacroExpander,
}; };