Skip to content

Commit bd18227

Browse files
rust-timerrust-timer
authored
Unrolled build for #144726
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 3fb1b53 + e1d3ad8 commit bd18227

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
@@ -3426,7 +3426,6 @@ dependencies = [
34263426
"rustc_abi",
34273427
"rustc_ast",
34283428
"rustc_ast_pretty",
3429-
"rustc_attr_data_structures",
34303429
"rustc_attr_parsing",
34313430
"rustc_data_structures",
34323431
"rustc_errors",
@@ -3476,28 +3475,13 @@ dependencies = [
34763475
"thin-vec",
34773476
]
34783477

3479-
[[package]]
3480-
name = "rustc_attr_data_structures"
3481-
version = "0.0.0"
3482-
dependencies = [
3483-
"rustc_abi",
3484-
"rustc_ast",
3485-
"rustc_ast_pretty",
3486-
"rustc_data_structures",
3487-
"rustc_macros",
3488-
"rustc_serialize",
3489-
"rustc_span",
3490-
"thin-vec",
3491-
]
3492-
34933478
[[package]]
34943479
name = "rustc_attr_parsing"
34953480
version = "0.0.0"
34963481
dependencies = [
34973482
"rustc_abi",
34983483
"rustc_ast",
34993484
"rustc_ast_pretty",
3500-
"rustc_attr_data_structures",
35013485
"rustc_errors",
35023486
"rustc_feature",
35033487
"rustc_fluent_macro",
@@ -3553,7 +3537,6 @@ version = "0.0.0"
35533537
dependencies = [
35543538
"rustc_ast",
35553539
"rustc_ast_pretty",
3556-
"rustc_attr_data_structures",
35573540
"rustc_attr_parsing",
35583541
"rustc_data_structures",
35593542
"rustc_errors",
@@ -3589,7 +3572,6 @@ dependencies = [
35893572
"rustc-demangle",
35903573
"rustc_abi",
35913574
"rustc_ast",
3592-
"rustc_attr_data_structures",
35933575
"rustc_codegen_ssa",
35943576
"rustc_data_structures",
35953577
"rustc_errors",
@@ -3630,7 +3612,6 @@ dependencies = [
36303612
"rustc_abi",
36313613
"rustc_arena",
36323614
"rustc_ast",
3633-
"rustc_attr_data_structures",
36343615
"rustc_attr_parsing",
36353616
"rustc_data_structures",
36363617
"rustc_errors",
@@ -3668,7 +3649,6 @@ dependencies = [
36683649
"rustc_abi",
36693650
"rustc_apfloat",
36703651
"rustc_ast",
3671-
"rustc_attr_data_structures",
36723652
"rustc_data_structures",
36733653
"rustc_errors",
36743654
"rustc_fluent_macro",
@@ -3814,7 +3794,6 @@ dependencies = [
38143794
"rustc_abi",
38153795
"rustc_ast",
38163796
"rustc_ast_pretty",
3817-
"rustc_attr_data_structures",
38183797
"rustc_data_structures",
38193798
"rustc_error_codes",
38203799
"rustc_error_messages",
@@ -3844,7 +3823,6 @@ dependencies = [
38443823
"rustc_ast",
38453824
"rustc_ast_passes",
38463825
"rustc_ast_pretty",
3847-
"rustc_attr_data_structures",
38483826
"rustc_attr_parsing",
38493827
"rustc_data_structures",
38503828
"rustc_errors",
@@ -3868,8 +3846,8 @@ dependencies = [
38683846
name = "rustc_feature"
38693847
version = "0.0.0"
38703848
dependencies = [
3871-
"rustc_attr_data_structures",
38723849
"rustc_data_structures",
3850+
"rustc_hir",
38733851
"rustc_span",
38743852
"serde",
38753853
"serde_json",
@@ -3914,7 +3892,7 @@ dependencies = [
39143892
"rustc_abi",
39153893
"rustc_arena",
39163894
"rustc_ast",
3917-
"rustc_attr_data_structures",
3895+
"rustc_ast_pretty",
39183896
"rustc_data_structures",
39193897
"rustc_hashes",
39203898
"rustc_index",
@@ -3935,7 +3913,6 @@ dependencies = [
39353913
"rustc_abi",
39363914
"rustc_arena",
39373915
"rustc_ast",
3938-
"rustc_attr_data_structures",
39393916
"rustc_attr_parsing",
39403917
"rustc_data_structures",
39413918
"rustc_errors",
@@ -3962,7 +3939,6 @@ dependencies = [
39623939
"rustc_abi",
39633940
"rustc_ast",
39643941
"rustc_ast_pretty",
3965-
"rustc_attr_data_structures",
39663942
"rustc_hir",
39673943
"rustc_span",
39683944
]
@@ -3974,7 +3950,6 @@ dependencies = [
39743950
"itertools",
39753951
"rustc_abi",
39763952
"rustc_ast",
3977-
"rustc_attr_data_structures",
39783953
"rustc_attr_parsing",
39793954
"rustc_data_structures",
39803955
"rustc_errors",
@@ -4120,7 +4095,6 @@ dependencies = [
41204095
"rustc_abi",
41214096
"rustc_ast",
41224097
"rustc_ast_pretty",
4123-
"rustc_attr_data_structures",
41244098
"rustc_attr_parsing",
41254099
"rustc_data_structures",
41264100
"rustc_errors",
@@ -4194,7 +4168,6 @@ dependencies = [
41944168
"odht",
41954169
"rustc_abi",
41964170
"rustc_ast",
4197-
"rustc_attr_data_structures",
41984171
"rustc_attr_parsing",
41994172
"rustc_data_structures",
42004173
"rustc_errors",
@@ -4230,7 +4203,6 @@ dependencies = [
42304203
"rustc_arena",
42314204
"rustc_ast",
42324205
"rustc_ast_ir",
4233-
"rustc_attr_data_structures",
42344206
"rustc_data_structures",
42354207
"rustc_error_messages",
42364208
"rustc_errors",
@@ -4264,7 +4236,6 @@ dependencies = [
42644236
"rustc_apfloat",
42654237
"rustc_arena",
42664238
"rustc_ast",
4267-
"rustc_attr_data_structures",
42684239
"rustc_data_structures",
42694240
"rustc_errors",
42704241
"rustc_fluent_macro",
@@ -4311,7 +4282,6 @@ dependencies = [
43114282
"rustc_abi",
43124283
"rustc_arena",
43134284
"rustc_ast",
4314-
"rustc_attr_data_structures",
43154285
"rustc_const_eval",
43164286
"rustc_data_structures",
43174287
"rustc_errors",
@@ -4337,7 +4307,6 @@ version = "0.0.0"
43374307
dependencies = [
43384308
"rustc_abi",
43394309
"rustc_ast",
4340-
"rustc_attr_data_structures",
43414310
"rustc_data_structures",
43424311
"rustc_errors",
43434312
"rustc_fluent_macro",
@@ -4408,7 +4377,6 @@ dependencies = [
44084377
"rustc_ast",
44094378
"rustc_ast_lowering",
44104379
"rustc_ast_pretty",
4411-
"rustc_attr_data_structures",
44124380
"rustc_attr_parsing",
44134381
"rustc_data_structures",
44144382
"rustc_errors",
@@ -4455,7 +4423,6 @@ name = "rustc_privacy"
44554423
version = "0.0.0"
44564424
dependencies = [
44574425
"rustc_ast",
4458-
"rustc_attr_data_structures",
44594426
"rustc_data_structures",
44604427
"rustc_errors",
44614428
"rustc_fluent_macro",
@@ -4530,7 +4497,6 @@ dependencies = [
45304497
"parking_lot",
45314498
"rustc_abi",
45324499
"rustc_ast",
4533-
"rustc_attr_data_structures",
45344500
"rustc_data_structures",
45354501
"rustc_errors",
45364502
"rustc_feature",
@@ -4557,7 +4523,6 @@ dependencies = [
45574523
"rustc_arena",
45584524
"rustc_ast",
45594525
"rustc_ast_pretty",
4560-
"rustc_attr_data_structures",
45614526
"rustc_attr_parsing",
45624527
"rustc_data_structures",
45634528
"rustc_errors",
@@ -4720,7 +4685,6 @@ dependencies = [
47204685
"itertools",
47214686
"rustc_abi",
47224687
"rustc_ast",
4723-
"rustc_attr_data_structures",
47244688
"rustc_data_structures",
47254689
"rustc_errors",
47264690
"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)