Skip to content

Commit 26c28ee

Browse files
jdonszelmannjdonszelmann
authored
Rollup merge of #144726 - jdonszelmann:move-attr-data-structures, r=lcnr
merge rustc_attr_data_structures into rustc_hir this move was discussed on zulip: [#t-compiler > attribute parsing rework @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/attribute.20parsing.20rework/near/528530091) Many PRs in the attribute rework depend on this move.
2 parents 5712d50 + e1d3ad8 commit 26c28ee

File tree

186 files changed

+380
-452
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+380
-452
lines changed

‎Cargo.lock

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3427,7 +3427,6 @@ dependencies = [
34273427
"rustc_abi",
34283428
"rustc_ast",
34293429
"rustc_ast_pretty",
3430-
"rustc_attr_data_structures",
34313430
"rustc_attr_parsing",
34323431
"rustc_data_structures",
34333432
"rustc_errors",
@@ -3477,28 +3476,13 @@ dependencies = [
34773476
"thin-vec",
34783477
]
34793478

3480-
[[package]]
3481-
name = "rustc_attr_data_structures"
3482-
version = "0.0.0"
3483-
dependencies = [
3484-
"rustc_abi",
3485-
"rustc_ast",
3486-
"rustc_ast_pretty",
3487-
"rustc_data_structures",
3488-
"rustc_macros",
3489-
"rustc_serialize",
3490-
"rustc_span",
3491-
"thin-vec",
3492-
]
3493-
34943479
[[package]]
34953480
name = "rustc_attr_parsing"
34963481
version = "0.0.0"
34973482
dependencies = [
34983483
"rustc_abi",
34993484
"rustc_ast",
35003485
"rustc_ast_pretty",
3501-
"rustc_attr_data_structures",
35023486
"rustc_errors",
35033487
"rustc_feature",
35043488
"rustc_fluent_macro",
@@ -3554,7 +3538,6 @@ version = "0.0.0"
35543538
dependencies = [
35553539
"rustc_ast",
35563540
"rustc_ast_pretty",
3557-
"rustc_attr_data_structures",
35583541
"rustc_attr_parsing",
35593542
"rustc_data_structures",
35603543
"rustc_errors",
@@ -3590,7 +3573,6 @@ dependencies = [
35903573
"rustc-demangle",
35913574
"rustc_abi",
35923575
"rustc_ast",
3593-
"rustc_attr_data_structures",
35943576
"rustc_codegen_ssa",
35953577
"rustc_data_structures",
35963578
"rustc_errors",
@@ -3631,7 +3613,6 @@ dependencies = [
36313613
"rustc_abi",
36323614
"rustc_arena",
36333615
"rustc_ast",
3634-
"rustc_attr_data_structures",
36353616
"rustc_attr_parsing",
36363617
"rustc_data_structures",
36373618
"rustc_errors",
@@ -3669,7 +3650,6 @@ dependencies = [
36693650
"rustc_abi",
36703651
"rustc_apfloat",
36713652
"rustc_ast",
3672-
"rustc_attr_data_structures",
36733653
"rustc_data_structures",
36743654
"rustc_errors",
36753655
"rustc_fluent_macro",
@@ -3815,7 +3795,6 @@ dependencies = [
38153795
"rustc_abi",
38163796
"rustc_ast",
38173797
"rustc_ast_pretty",
3818-
"rustc_attr_data_structures",
38193798
"rustc_data_structures",
38203799
"rustc_error_codes",
38213800
"rustc_error_messages",
@@ -3845,7 +3824,6 @@ dependencies = [
38453824
"rustc_ast",
38463825
"rustc_ast_passes",
38473826
"rustc_ast_pretty",
3848-
"rustc_attr_data_structures",
38493827
"rustc_attr_parsing",
38503828
"rustc_data_structures",
38513829
"rustc_errors",
@@ -3869,8 +3847,8 @@ dependencies = [
38693847
name = "rustc_feature"
38703848
version = "0.0.0"
38713849
dependencies = [
3872-
"rustc_attr_data_structures",
38733850
"rustc_data_structures",
3851+
"rustc_hir",
38743852
"rustc_span",
38753853
"serde",
38763854
"serde_json",
@@ -3915,7 +3893,7 @@ dependencies = [
39153893
"rustc_abi",
39163894
"rustc_arena",
39173895
"rustc_ast",
3918-
"rustc_attr_data_structures",
3896+
"rustc_ast_pretty",
39193897
"rustc_data_structures",
39203898
"rustc_hashes",
39213899
"rustc_index",
@@ -3936,7 +3914,6 @@ dependencies = [
39363914
"rustc_abi",
39373915
"rustc_arena",
39383916
"rustc_ast",
3939-
"rustc_attr_data_structures",
39403917
"rustc_attr_parsing",
39413918
"rustc_data_structures",
39423919
"rustc_errors",
@@ -3963,7 +3940,6 @@ dependencies = [
39633940
"rustc_abi",
39643941
"rustc_ast",
39653942
"rustc_ast_pretty",
3966-
"rustc_attr_data_structures",
39673943
"rustc_hir",
39683944
"rustc_span",
39693945
]
@@ -3975,7 +3951,6 @@ dependencies = [
39753951
"itertools",
39763952
"rustc_abi",
39773953
"rustc_ast",
3978-
"rustc_attr_data_structures",
39793954
"rustc_attr_parsing",
39803955
"rustc_data_structures",
39813956
"rustc_errors",
@@ -4121,7 +4096,6 @@ dependencies = [
41214096
"rustc_abi",
41224097
"rustc_ast",
41234098
"rustc_ast_pretty",
4124-
"rustc_attr_data_structures",
41254099
"rustc_attr_parsing",
41264100
"rustc_data_structures",
41274101
"rustc_errors",
@@ -4195,7 +4169,6 @@ dependencies = [
41954169
"odht",
41964170
"rustc_abi",
41974171
"rustc_ast",
4198-
"rustc_attr_data_structures",
41994172
"rustc_attr_parsing",
42004173
"rustc_data_structures",
42014174
"rustc_errors",
@@ -4231,7 +4204,6 @@ dependencies = [
42314204
"rustc_arena",
42324205
"rustc_ast",
42334206
"rustc_ast_ir",
4234-
"rustc_attr_data_structures",
42354207
"rustc_data_structures",
42364208
"rustc_error_messages",
42374209
"rustc_errors",
@@ -4265,7 +4237,6 @@ dependencies = [
42654237
"rustc_apfloat",
42664238
"rustc_arena",
42674239
"rustc_ast",
4268-
"rustc_attr_data_structures",
42694240
"rustc_data_structures",
42704241
"rustc_errors",
42714242
"rustc_fluent_macro",
@@ -4312,7 +4283,6 @@ dependencies = [
43124283
"rustc_abi",
43134284
"rustc_arena",
43144285
"rustc_ast",
4315-
"rustc_attr_data_structures",
43164286
"rustc_const_eval",
43174287
"rustc_data_structures",
43184288
"rustc_errors",
@@ -4338,7 +4308,6 @@ version = "0.0.0"
43384308
dependencies = [
43394309
"rustc_abi",
43404310
"rustc_ast",
4341-
"rustc_attr_data_structures",
43424311
"rustc_data_structures",
43434312
"rustc_errors",
43444313
"rustc_fluent_macro",
@@ -4409,7 +4378,6 @@ dependencies = [
44094378
"rustc_ast",
44104379
"rustc_ast_lowering",
44114380
"rustc_ast_pretty",
4412-
"rustc_attr_data_structures",
44134381
"rustc_attr_parsing",
44144382
"rustc_data_structures",
44154383
"rustc_errors",
@@ -4456,7 +4424,6 @@ name = "rustc_privacy"
44564424
version = "0.0.0"
44574425
dependencies = [
44584426
"rustc_ast",
4459-
"rustc_attr_data_structures",
44604427
"rustc_data_structures",
44614428
"rustc_errors",
44624429
"rustc_fluent_macro",
@@ -4531,7 +4498,6 @@ dependencies = [
45314498
"parking_lot",
45324499
"rustc_abi",
45334500
"rustc_ast",
4534-
"rustc_attr_data_structures",
45354501
"rustc_data_structures",
45364502
"rustc_errors",
45374503
"rustc_feature",
@@ -4558,7 +4524,6 @@ dependencies = [
45584524
"rustc_arena",
45594525
"rustc_ast",
45604526
"rustc_ast_pretty",
4561-
"rustc_attr_data_structures",
45624527
"rustc_attr_parsing",
45634528
"rustc_data_structures",
45644529
"rustc_errors",
@@ -4721,7 +4686,6 @@ dependencies = [
47214686
"itertools",
47224687
"rustc_abi",
47234688
"rustc_ast",
4724-
"rustc_attr_data_structures",
47254689
"rustc_data_structures",
47264690
"rustc_errors",
47274691
"rustc_fluent_macro",

‎compiler/rustc_ast_lowering/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ doctest = false
1111
rustc_abi = { path = "../rustc_abi" }
1212
rustc_ast = { path = "../rustc_ast" }
1313
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
14-
rustc_attr_data_structures = { path = "../rustc_attr_data_structures" }
1514
rustc_attr_parsing = { path = "../rustc_attr_parsing" }
1615
rustc_data_structures = { path = "../rustc_data_structures" }
1716
rustc_errors = { path = "../rustc_errors" }

‎compiler/rustc_ast_lowering/src/expr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ use std::sync::Arc;
44
use rustc_ast::ptr::P as AstP;
55
use rustc_ast::*;
66
use rustc_ast_pretty::pprust::expr_to_string;
7-
use rustc_attr_data_structures::{AttributeKind, find_attr};
87
use rustc_data_structures::stack::ensure_sufficient_stack;
98
use rustc_hir as hir;
10-
use rustc_hir::HirId;
9+
use rustc_hir::attrs::AttributeKind;
1110
use rustc_hir::def::{DefKind, Res};
11+
use rustc_hir::{HirId, find_attr};
1212
use rustc_middle::span_bug;
1313
use rustc_middle::ty::TyCtxt;
1414
use rustc_session::errors::report_lit_error;

‎compiler/rustc_ast_lowering/src/item.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ use rustc_abi::ExternAbi;
22
use rustc_ast::ptr::P;
33
use rustc_ast::visit::AssocCtxt;
44
use rustc_ast::*;
5-
use rustc_attr_data_structures::{AttributeKind, find_attr};
65
use rustc_errors::{E0570, ErrorGuaranteed, struct_span_code_err};
6+
use rustc_hir::attrs::AttributeKind;
77
use rustc_hir::def::{DefKind, PerNS, Res};
88
use rustc_hir::def_id::{CRATE_DEF_ID, LocalDefId};
9-
use rustc_hir::{self as hir, HirId, LifetimeSource, PredicateOrigin};
9+
use rustc_hir::{self as hir, HirId, LifetimeSource, PredicateOrigin, find_attr};
1010
use rustc_index::{IndexSlice, IndexVec};
1111
use rustc_middle::span_bug;
1212
use rustc_middle::ty::{ResolverAstLowering, TyCtxt};

‎compiler/rustc_attr_data_structures/Cargo.toml

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎compiler/rustc_attr_data_structures/src/lints.rs

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎compiler/rustc_attr_parsing/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ edition = "2024"
88
rustc_abi = { path = "../rustc_abi" }
99
rustc_ast = { path = "../rustc_ast" }
1010
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
11-
rustc_attr_data_structures = { path = "../rustc_attr_data_structures" }
1211
rustc_errors = { path = "../rustc_errors" }
1312
rustc_feature = { path = "../rustc_feature" }
1413
rustc_fluent_macro = { path = "../rustc_fluent_macro" }

‎compiler/rustc_attr_parsing/src/attributes/allow_unstable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::iter;
22

3-
use rustc_attr_data_structures::AttributeKind;
43
use rustc_feature::{AttributeTemplate, template};
4+
use rustc_hir::attrs::AttributeKind;
55
use rustc_span::{Span, Symbol, sym};
66

77
use super::{CombineAttributeParser, ConvertFn};

‎compiler/rustc_attr_parsing/src/attributes/cfg.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use rustc_ast::{LitKind, NodeId};
2-
use rustc_attr_data_structures::{CfgEntry, RustcVersion};
32
use rustc_feature::{AttributeTemplate, Features, template};
3+
use rustc_hir::RustcVersion;
4+
use rustc_hir::attrs::CfgEntry;
45
use rustc_session::Session;
56
use rustc_session::config::ExpectedValues;
67
use rustc_session::lint::BuiltinLintDiag;

‎compiler/rustc_attr_parsing/src/attributes/cfg_old.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rustc_ast::{LitKind, MetaItem, MetaItemInner, MetaItemKind, MetaItemLit, NodeId};
22
use rustc_ast_pretty::pprust;
3-
use rustc_attr_data_structures::RustcVersion;
43
use rustc_feature::{Features, GatedCfg, find_gated_cfg};
4+
use rustc_hir::RustcVersion;
55
use rustc_session::Session;
66
use rustc_session::config::ExpectedValues;
77
use rustc_session::lint::builtin::UNEXPECTED_CFGS;

0 commit comments

Comments
 (0)