Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit c3b78f4

Browse files
committed
Auto merge of rust-lang#13917 - Veykril:raw-attrs, r=Veykril
Split out hir-def attribute handling parts into hir-expand This should help with `cfg_attr` handling for macro inputs
2 parents 674b52a + 621e96b commit c3b78f4

39 files changed

+510
-410
lines changed

Cargo.lock

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/hir-def/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ smallvec = "1.10.0"
2929
tracing = "0.1.35"
3030

3131
stdx = { path = "../stdx", version = "0.0.0" }
32+
intern = { path = "../intern", version = "0.0.0" }
3233
base-db = { path = "../base-db", version = "0.0.0" }
3334
syntax = { path = "../syntax", version = "0.0.0" }
3435
profile = { path = "../profile", version = "0.0.0" }

crates/hir-def/src/adt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use hir_expand::{
88
name::{AsName, Name},
99
HirFileId, InFile,
1010
};
11+
use intern::Interned;
1112
use la_arena::{Arena, ArenaMap};
1213
use rustc_abi::{Integer, IntegerType};
1314
use syntax::ast::{self, HasName, HasVisibility};
@@ -17,7 +18,6 @@ use crate::{
1718
body::{CfgExpander, LowerCtx},
1819
builtin_type::{BuiltinInt, BuiltinUint},
1920
db::DefDatabase,
20-
intern::Interned,
2121
item_tree::{AttrOwner, Field, FieldAstId, Fields, ItemTree, ModItem, RawVisibilityId},
2222
layout::{Align, ReprFlags, ReprOptions},
2323
nameres::diagnostics::DefDiagnostic,

0 commit comments

Comments
 (0)