Skip to content

Commit 26f476a

Browse files
borsbors
committed
Auto merge of rust-lang#137610 - Kobzol:revert-135726, r=<try>
Revert "Auto merge of rust-lang#135726 - jdonszelmann:attr-parsing, r=oli-obk" Trying to revert rust-lang#135726 and do some perf. runs on it. r? `@ghost`
2 parents ad27045 + 8cbc938 commit 26f476a

File tree

167 files changed

+2260
-3931
lines changed

Some content is hidden

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

167 files changed

+2260
-3931
lines changed

‎Cargo.lock

+5-14
Original file line numberDiff line numberDiff line change
@@ -3207,7 +3207,6 @@ dependencies = [
32073207
"rustc_abi",
32083208
"rustc_ast",
32093209
"rustc_ast_pretty",
3210-
"rustc_attr_parsing",
32113210
"rustc_data_structures",
32123211
"rustc_errors",
32133212
"rustc_feature",
@@ -3216,7 +3215,6 @@ dependencies = [
32163215
"rustc_index",
32173216
"rustc_macros",
32183217
"rustc_middle",
3219-
"rustc_parse",
32203218
"rustc_session",
32213219
"rustc_span",
32223220
"rustc_target",
@@ -3265,10 +3263,14 @@ dependencies = [
32653263
"rustc_ast",
32663264
"rustc_ast_pretty",
32673265
"rustc_data_structures",
3266+
"rustc_errors",
3267+
"rustc_feature",
3268+
"rustc_fluent_macro",
3269+
"rustc_lexer",
32683270
"rustc_macros",
32693271
"rustc_serialize",
3272+
"rustc_session",
32703273
"rustc_span",
3271-
"thin-vec",
32723274
]
32733275

32743276
[[package]]
@@ -3283,13 +3285,11 @@ dependencies = [
32833285
"rustc_errors",
32843286
"rustc_feature",
32853287
"rustc_fluent_macro",
3286-
"rustc_hir",
32873288
"rustc_lexer",
32883289
"rustc_macros",
32893290
"rustc_serialize",
32903291
"rustc_session",
32913292
"rustc_span",
3292-
"thin-vec",
32933293
]
32943294

32953295
[[package]]
@@ -3342,7 +3342,6 @@ dependencies = [
33423342
"rustc_expand",
33433343
"rustc_feature",
33443344
"rustc_fluent_macro",
3345-
"rustc_hir",
33463345
"rustc_index",
33473346
"rustc_lexer",
33483347
"rustc_lint_defs",
@@ -3599,7 +3598,6 @@ dependencies = [
35993598
"rustc_abi",
36003599
"rustc_ast",
36013600
"rustc_ast_pretty",
3602-
"rustc_attr_data_structures",
36033601
"rustc_data_structures",
36043602
"rustc_error_codes",
36053603
"rustc_error_messages",
@@ -3634,7 +3632,6 @@ dependencies = [
36343632
"rustc_errors",
36353633
"rustc_feature",
36363634
"rustc_fluent_macro",
3637-
"rustc_hir",
36383635
"rustc_lexer",
36393636
"rustc_lint_defs",
36403637
"rustc_macros",
@@ -3693,7 +3690,6 @@ dependencies = [
36933690
"rustc_abi",
36943691
"rustc_arena",
36953692
"rustc_ast",
3696-
"rustc_attr_data_structures",
36973693
"rustc_data_structures",
36983694
"rustc_hashes",
36993695
"rustc_index",
@@ -3741,7 +3737,6 @@ dependencies = [
37413737
"rustc_abi",
37423738
"rustc_ast",
37433739
"rustc_ast_pretty",
3744-
"rustc_attr_parsing",
37453740
"rustc_hir",
37463741
"rustc_span",
37473742
]
@@ -4249,7 +4244,6 @@ name = "rustc_query_impl"
42494244
version = "0.0.0"
42504245
dependencies = [
42514246
"measureme",
4252-
"rustc_attr_data_structures",
42534247
"rustc_data_structures",
42544248
"rustc_errors",
42554249
"rustc_hashes",
@@ -4272,7 +4266,6 @@ dependencies = [
42724266
"rustc-rayon-core",
42734267
"rustc_abi",
42744268
"rustc_ast",
4275-
"rustc_attr_data_structures",
42764269
"rustc_data_structures",
42774270
"rustc_errors",
42784271
"rustc_feature",
@@ -4323,7 +4316,6 @@ version = "0.0.0"
43234316
dependencies = [
43244317
"bitflags",
43254318
"rustc_abi",
4326-
"rustc_ast",
43274319
"rustc_data_structures",
43284320
"rustc_hir",
43294321
"rustc_middle",
@@ -4420,7 +4412,6 @@ dependencies = [
44204412
"punycode",
44214413
"rustc-demangle",
44224414
"rustc_abi",
4423-
"rustc_ast",
44244415
"rustc_data_structures",
44254416
"rustc_errors",
44264417
"rustc_hashes",

‎compiler/rustc_ast_lowering/Cargo.toml

-2
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_parsing = { path = "../rustc_attr_parsing" }
1514
rustc_data_structures = { path = "../rustc_data_structures" }
1615
rustc_errors = { path = "../rustc_errors" }
1716
rustc_feature = { path = "../rustc_feature" }
@@ -20,7 +19,6 @@ rustc_hir = { path = "../rustc_hir" }
2019
rustc_index = { path = "../rustc_index" }
2120
rustc_macros = { path = "../rustc_macros" }
2221
rustc_middle = { path = "../rustc_middle" }
23-
rustc_parse = { path = "../rustc_parse" }
2422
rustc_session = { path = "../rustc_session" }
2523
rustc_span = { path = "../rustc_span" }
2624
rustc_target = { path = "../rustc_target" }

‎compiler/rustc_ast_lowering/src/block.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
108108
};
109109
let span = self.lower_span(l.span);
110110
let source = hir::LocalSource::Normal;
111-
self.lower_attrs(hir_id, &l.attrs, l.span);
111+
self.lower_attrs(hir_id, &l.attrs);
112112
self.arena.alloc(hir::LetStmt { hir_id, ty, pat, init, els, span, source })
113113
}
114114

‎compiler/rustc_ast_lowering/src/expr.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ impl<'hir> LoweringContext<'_, 'hir> {
7777
self.attrs.insert(
7878
ex.hir_id.local_id,
7979
&*self.arena.alloc_from_iter(
80-
self.lower_attrs_vec(&e.attrs, e.span)
81-
.into_iter()
80+
e.attrs
81+
.iter()
82+
.map(|a| self.lower_attr(a))
8283
.chain(old_attrs.iter().cloned()),
8384
),
8485
);
@@ -97,7 +98,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
9798
}
9899

99100
let expr_hir_id = self.lower_node_id(e.id);
100-
self.lower_attrs(expr_hir_id, &e.attrs, e.span);
101+
self.lower_attrs(expr_hir_id, &e.attrs);
101102

102103
let kind = match &e.kind {
103104
ExprKind::Array(exprs) => hir::ExprKind::Array(self.lower_exprs(exprs)),
@@ -669,7 +670,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
669670
let guard = arm.guard.as_ref().map(|cond| self.lower_expr(cond));
670671
let hir_id = self.next_id();
671672
let span = self.lower_span(arm.span);
672-
self.lower_attrs(hir_id, &arm.attrs, arm.span);
673+
self.lower_attrs(hir_id, &arm.attrs);
673674
let is_never_pattern = pat.is_never_pattern();
674675
let body = if let Some(body) = &arm.body
675676
&& !is_never_pattern
@@ -838,7 +839,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
838839
style: AttrStyle::Outer,
839840
span: unstable_span,
840841
}],
841-
span,
842842
);
843843
}
844844
}
@@ -1673,7 +1673,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
16731673

16741674
fn lower_expr_field(&mut self, f: &ExprField) -> hir::ExprField<'hir> {
16751675
let hir_id = self.lower_node_id(f.id);
1676-
self.lower_attrs(hir_id, &f.attrs, f.span);
1676+
self.lower_attrs(hir_id, &f.attrs);
16771677
hir::ExprField {
16781678
hir_id,
16791679
ident: self.lower_ident(f.ident),
@@ -1936,7 +1936,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
19361936
//
19371937
// Also, add the attributes to the outer returned expr node.
19381938
let expr = self.expr_drop_temps_mut(for_span, match_expr);
1939-
self.lower_attrs(expr.hir_id, &e.attrs, e.span);
1939+
self.lower_attrs(expr.hir_id, &e.attrs);
19401940
expr
19411941
}
19421942

@@ -1993,7 +1993,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
19931993
let val_ident = Ident::with_dummy_span(sym::val);
19941994
let (val_pat, val_pat_nid) = self.pat_ident(span, val_ident);
19951995
let val_expr = self.expr_ident(span, val_ident, val_pat_nid);
1996-
self.lower_attrs(val_expr.hir_id, &attrs, span);
1996+
self.lower_attrs(val_expr.hir_id, &attrs);
19971997
let continue_pat = self.pat_cf_continue(unstable_span, val_pat);
19981998
self.arm(continue_pat, val_expr)
19991999
};
@@ -2024,7 +2024,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
20242024
let ret_expr = self.checked_return(Some(from_residual_expr));
20252025
self.arena.alloc(self.expr(try_span, ret_expr))
20262026
};
2027-
self.lower_attrs(ret_expr.hir_id, &attrs, ret_expr.span);
2027+
self.lower_attrs(ret_expr.hir_id, &attrs);
20282028

20292029
let break_pat = self.pat_cf_break(try_span, residual_local);
20302030
self.arm(break_pat, ret_expr)

‎compiler/rustc_ast_lowering/src/item.rs

+9-10
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rustc_index::{IndexSlice, IndexVec};
1111
use rustc_middle::span_bug;
1212
use rustc_middle::ty::{ResolverAstLowering, TyCtxt};
1313
use rustc_span::edit_distance::find_best_match_for_name;
14-
use rustc_span::{DUMMY_SP, DesugaringKind, Ident, Span, Symbol, kw, sym};
14+
use rustc_span::{DesugaringKind, Ident, Span, Symbol, kw, sym};
1515
use smallvec::{SmallVec, smallvec};
1616
use thin_vec::ThinVec;
1717
use tracing::instrument;
@@ -93,8 +93,7 @@ impl<'a, 'hir> ItemLowerer<'a, 'hir> {
9393
debug_assert_eq!(self.resolver.node_id_to_def_id[&CRATE_NODE_ID], CRATE_DEF_ID);
9494
self.with_lctx(CRATE_NODE_ID, |lctx| {
9595
let module = lctx.lower_mod(&c.items, &c.spans);
96-
// FIXME(jdonszelman): is dummy span ever a problem here?
97-
lctx.lower_attrs(hir::CRATE_HIR_ID, &c.attrs, DUMMY_SP);
96+
lctx.lower_attrs(hir::CRATE_HIR_ID, &c.attrs);
9897
hir::OwnerNode::Crate(module)
9998
})
10099
}
@@ -158,7 +157,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
158157
let mut ident = i.ident;
159158
let vis_span = self.lower_span(i.vis.span);
160159
let hir_id = hir::HirId::make_owner(self.current_hir_id_owner.def_id);
161-
let attrs = self.lower_attrs(hir_id, &i.attrs, i.span);
160+
let attrs = self.lower_attrs(hir_id, &i.attrs);
162161
let kind = self.lower_item_kind(i.span, i.id, hir_id, &mut ident, attrs, vis_span, &i.kind);
163162
let item = hir::Item {
164163
owner_id: hir_id.expect_owner(),
@@ -621,7 +620,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
621620
fn lower_foreign_item(&mut self, i: &ForeignItem) -> &'hir hir::ForeignItem<'hir> {
622621
let hir_id = hir::HirId::make_owner(self.current_hir_id_owner.def_id);
623622
let owner_id = hir_id.expect_owner();
624-
let attrs = self.lower_attrs(hir_id, &i.attrs, i.span);
623+
let attrs = self.lower_attrs(hir_id, &i.attrs);
625624
let item = hir::ForeignItem {
626625
owner_id,
627626
ident: self.lower_ident(i.ident),
@@ -679,7 +678,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
679678

680679
fn lower_variant(&mut self, v: &Variant) -> hir::Variant<'hir> {
681680
let hir_id = self.lower_node_id(v.id);
682-
self.lower_attrs(hir_id, &v.attrs, v.span);
681+
self.lower_attrs(hir_id, &v.attrs);
683682
hir::Variant {
684683
hir_id,
685684
def_id: self.local_def_id(v.id),
@@ -741,7 +740,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
741740
) -> hir::FieldDef<'hir> {
742741
let ty = self.lower_ty(&f.ty, ImplTraitContext::Disallowed(ImplTraitPosition::FieldTy));
743742
let hir_id = self.lower_node_id(f.id);
744-
self.lower_attrs(hir_id, &f.attrs, f.span);
743+
self.lower_attrs(hir_id, &f.attrs);
745744
hir::FieldDef {
746745
span: self.lower_span(f.span),
747746
hir_id,
@@ -760,7 +759,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
760759

761760
fn lower_trait_item(&mut self, i: &AssocItem) -> &'hir hir::TraitItem<'hir> {
762761
let hir_id = hir::HirId::make_owner(self.current_hir_id_owner.def_id);
763-
let attrs = self.lower_attrs(hir_id, &i.attrs, i.span);
762+
let attrs = self.lower_attrs(hir_id, &i.attrs);
764763
let trait_item_def_id = hir_id.expect_owner();
765764

766765
let (generics, kind, has_default) = match &i.kind {
@@ -896,7 +895,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
896895
let has_value = true;
897896
let (defaultness, _) = self.lower_defaultness(i.kind.defaultness(), has_value);
898897
let hir_id = hir::HirId::make_owner(self.current_hir_id_owner.def_id);
899-
let attrs = self.lower_attrs(hir_id, &i.attrs, i.span);
898+
let attrs = self.lower_attrs(hir_id, &i.attrs);
900899

901900
let (generics, kind) = match &i.kind {
902901
AssocItemKind::Const(box ConstItem { generics, ty, expr, .. }) => self.lower_generics(
@@ -1057,7 +1056,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
10571056

10581057
fn lower_param(&mut self, param: &Param) -> hir::Param<'hir> {
10591058
let hir_id = self.lower_node_id(param.id);
1060-
self.lower_attrs(hir_id, &param.attrs, param.span);
1059+
self.lower_attrs(hir_id, &param.attrs);
10611060
hir::Param {
10621061
hir_id,
10631062
pat: self.lower_pat(&param.pat),

0 commit comments

Comments
 (0)