Skip to content

Commit f3888c6

Browse files
mejrsmejrs
committed
Remove rustc_attr_data_structures re-export from rustc_attr_parsing
1 parent 684b7b7 commit f3888c6

Some content is hidden

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

47 files changed

+77
-58
lines changed

‎Cargo.lock

+6
Original file line numberDiff line numberDiff line change
@@ -3376,6 +3376,7 @@ version = "0.0.0"
33763376
dependencies = [
33773377
"rustc_ast",
33783378
"rustc_ast_pretty",
3379+
"rustc_attr_data_structures",
33793380
"rustc_attr_parsing",
33803381
"rustc_data_structures",
33813382
"rustc_errors",
@@ -3453,6 +3454,7 @@ dependencies = [
34533454
"rustc_abi",
34543455
"rustc_arena",
34553456
"rustc_ast",
3457+
"rustc_attr_data_structures",
34563458
"rustc_attr_parsing",
34573459
"rustc_data_structures",
34583460
"rustc_errors",
@@ -3666,6 +3668,7 @@ dependencies = [
36663668
"rustc_ast",
36673669
"rustc_ast_passes",
36683670
"rustc_ast_pretty",
3671+
"rustc_attr_data_structures",
36693672
"rustc_attr_parsing",
36703673
"rustc_data_structures",
36713674
"rustc_errors",
@@ -3936,6 +3939,7 @@ dependencies = [
39363939
"rustc_abi",
39373940
"rustc_ast",
39383941
"rustc_ast_pretty",
3942+
"rustc_attr_data_structures",
39393943
"rustc_attr_parsing",
39403944
"rustc_data_structures",
39413945
"rustc_errors",
@@ -4009,6 +4013,7 @@ dependencies = [
40094013
"odht",
40104014
"rustc_abi",
40114015
"rustc_ast",
4016+
"rustc_attr_data_structures",
40124017
"rustc_attr_parsing",
40134018
"rustc_data_structures",
40144019
"rustc_errors",
@@ -4329,6 +4334,7 @@ dependencies = [
43294334
"rustc_arena",
43304335
"rustc_ast",
43314336
"rustc_ast_pretty",
4337+
"rustc_attr_data_structures",
43324338
"rustc_attr_parsing",
43334339
"rustc_data_structures",
43344340
"rustc_errors",

‎compiler/rustc_attr_parsing/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,5 @@ mod session_diagnostics;
9292
pub use attributes::cfg::*;
9393
pub use attributes::util::{find_crate_name, is_builtin_attr, parse_version};
9494
pub use context::{AttributeParser, OmitDoc};
95-
pub use rustc_attr_data_structures::*;
9695

9796
rustc_fluent_macro::fluent_messages! { "../messages.ftl" }

‎compiler/rustc_builtin_macros/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ doctest = false
1010
# tidy-alphabetical-start
1111
rustc_ast = { path = "../rustc_ast" }
1212
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
13+
rustc_attr_data_structures = { path = "../rustc_attr_data_structures" }
1314
rustc_attr_parsing = { path = "../rustc_attr_parsing" }
1415
rustc_data_structures = { path = "../rustc_data_structures" }
1516
rustc_errors = { path = "../rustc_errors" }

‎compiler/rustc_builtin_macros/src/deriving/generic/mod.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@ use rustc_ast::{
185185
self as ast, AnonConst, BindingMode, ByRef, EnumDef, Expr, GenericArg, GenericParamKind,
186186
Generics, Mutability, PatKind, VariantData,
187187
};
188-
use rustc_attr_parsing::{AttributeKind, AttributeParser, ReprPacked};
188+
use rustc_attr_data_structures::{AttributeKind, ReprPacked};
189+
use rustc_attr_parsing::AttributeParser;
189190
use rustc_expand::base::{Annotatable, ExtCtxt};
190191
use rustc_hir::Attribute;
191192
use rustc_span::{DUMMY_SP, Ident, Span, Symbol, kw, sym};

‎compiler/rustc_codegen_gcc/src/attributes.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
use gccjit::FnAttribute;
33
use gccjit::Function;
44
#[cfg(feature = "master")]
5-
use rustc_attr_parsing::InlineAttr;
6-
use rustc_attr_parsing::InstructionSetAttr;
5+
use rustc_attr_data_structures::InlineAttr;
6+
use rustc_attr_data_structures::InstructionSetAttr;
77
#[cfg(feature = "master")]
88
use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
99
use rustc_middle::ty;

‎compiler/rustc_codegen_gcc/src/callee.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ pub fn get_fn<'gcc, 'tcx>(cx: &CodegenCx<'gcc, 'tcx>, instance: Instance<'tcx>)
106106
// This is a monomorphization of a generic function.
107107
if !(cx.tcx.sess.opts.share_generics()
108108
|| tcx.codegen_fn_attrs(instance_def_id).inline
109-
== rustc_attr_parsing::InlineAttr::Never)
109+
== rustc_attr_data_structures::InlineAttr::Never)
110110
{
111111
// When not sharing generics, all instances are in the same
112112
// crate and have hidden visibility.

‎compiler/rustc_codegen_gcc/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ extern crate tracing;
3737
extern crate rustc_abi;
3838
extern crate rustc_apfloat;
3939
extern crate rustc_ast;
40-
extern crate rustc_attr_parsing;
40+
extern crate rustc_attr_data_structures;
4141
extern crate rustc_codegen_ssa;
4242
extern crate rustc_data_structures;
4343
extern crate rustc_errors;

‎compiler/rustc_codegen_ssa/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ regex = "1.4"
1919
rustc_abi = { path = "../rustc_abi" }
2020
rustc_arena = { path = "../rustc_arena" }
2121
rustc_ast = { path = "../rustc_ast" }
22+
rustc_attr_data_structures = { path = "../rustc_attr_data_structures" }
2223
rustc_attr_parsing = { path = "../rustc_attr_parsing" }
2324
rustc_data_structures = { path = "../rustc_data_structures" }
2425
rustc_errors = { path = "../rustc_errors" }

‎compiler/rustc_codegen_ssa/src/back/symbol_export.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ fn exported_symbols_provider_local<'tcx>(
370370

371371
if !tcx.sess.opts.share_generics() {
372372
if tcx.codegen_fn_attrs(mono_item.def_id()).inline
373-
== rustc_attr_parsing::InlineAttr::Never
373+
== rustc_attr_data_structures::InlineAttr::Never
374374
{
375375
// this is OK, we explicitly allow sharing inline(never) across crates even
376376
// without share-generics.

‎compiler/rustc_codegen_ssa/src/base.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use itertools::Itertools;
77
use rustc_abi::FIRST_VARIANT;
88
use rustc_ast as ast;
99
use rustc_ast::expand::allocator::{ALLOCATOR_METHODS, AllocatorKind, global_fn_name};
10-
use rustc_attr_parsing::OptimizeAttr;
10+
use rustc_attr_data_structures::OptimizeAttr;
1111
use rustc_data_structures::fx::{FxHashMap, FxIndexSet};
1212
use rustc_data_structures::profiling::{get_resident_set_size, print_time_passes_entry};
1313
use rustc_data_structures::sync::{IntoDynSyncSend, par_map};

‎compiler/rustc_codegen_ssa/src/codegen_attrs.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use std::str::FromStr;
33
use rustc_abi::ExternAbi;
44
use rustc_ast::expand::autodiff_attrs::{AutoDiffAttrs, DiffActivity, DiffMode};
55
use rustc_ast::{LitKind, MetaItem, MetaItemInner, attr};
6-
use rustc_attr_parsing::ReprAttr::ReprAlign;
7-
use rustc_attr_parsing::{AttributeKind, InlineAttr, InstructionSetAttr, OptimizeAttr};
6+
use rustc_attr_data_structures::ReprAttr::ReprAlign;
7+
use rustc_attr_data_structures::{AttributeKind, InlineAttr, InstructionSetAttr, OptimizeAttr};
88
use rustc_data_structures::fx::FxHashMap;
99
use rustc_hir::def::DefKind;
1010
use rustc_hir::def_id::{DefId, LOCAL_CRATE, LocalDefId};

‎compiler/rustc_codegen_ssa/src/mir/naked_asm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use rustc_abi::{BackendRepr, Float, Integer, Primitive, RegKind};
2-
use rustc_attr_parsing::InstructionSetAttr;
2+
use rustc_attr_data_structures::InstructionSetAttr;
33
use rustc_hir::def_id::DefId;
44
use rustc_middle::mir::mono::{Linkage, MonoItemData, Visibility};
55
use rustc_middle::mir::{InlineAsmOperand, START_BLOCK};

‎compiler/rustc_codegen_ssa/src/target_features.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use rustc_attr_parsing::InstructionSetAttr;
1+
use rustc_attr_data_structures::InstructionSetAttr;
22
use rustc_data_structures::fx::FxIndexSet;
33
use rustc_data_structures::unord::{UnordMap, UnordSet};
44
use rustc_errors::Applicability;

‎compiler/rustc_expand/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ doctest = false
1212
rustc_ast = { path = "../rustc_ast" }
1313
rustc_ast_passes = { path = "../rustc_ast_passes" }
1414
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
15+
rustc_attr_data_structures = { path = "../rustc_attr_data_structures" }
1516
rustc_attr_parsing = { path = "../rustc_attr_parsing" }
1617
rustc_data_structures = { path = "../rustc_data_structures" }
1718
rustc_errors = { path = "../rustc_errors" }

‎compiler/rustc_expand/src/base.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rustc_ast::token::MetaVarKind;
1111
use rustc_ast::tokenstream::TokenStream;
1212
use rustc_ast::visit::{AssocCtxt, Visitor};
1313
use rustc_ast::{self as ast, AttrVec, Attribute, HasAttrs, Item, NodeId, PatKind};
14-
use rustc_attr_parsing::{AttributeKind, Deprecation, Stability, find_attr};
14+
use rustc_attr_data_structures::{AttributeKind, Deprecation, Stability, find_attr};
1515
use rustc_data_structures::fx::FxIndexMap;
1616
use rustc_data_structures::sync;
1717
use rustc_errors::{DiagCtxtHandle, ErrorGuaranteed, PResult};

‎compiler/rustc_expand/src/mbe/macro_rules.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rustc_ast::token::{self, NonterminalKind, Token, TokenKind};
1010
use rustc_ast::tokenstream::{DelimSpan, TokenStream};
1111
use rustc_ast::{self as ast, DUMMY_NODE_ID, NodeId};
1212
use rustc_ast_pretty::pprust;
13-
use rustc_attr_parsing::{AttributeKind, find_attr};
13+
use rustc_attr_data_structures::{AttributeKind, find_attr};
1414
use rustc_data_structures::fx::{FxHashMap, FxIndexMap};
1515
use rustc_errors::{Applicability, Diag, ErrorGuaranteed};
1616
use rustc_feature::Features;

‎compiler/rustc_lint/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ 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" }
1112
rustc_attr_parsing = { path = "../rustc_attr_parsing" }
1213
rustc_data_structures = { path = "../rustc_data_structures" }
1314
rustc_errors = { path = "../rustc_errors" }

‎compiler/rustc_lint/src/nonstandard_style.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use rustc_abi::ExternAbi;
2-
use rustc_attr_parsing::{AttributeKind, AttributeParser, ReprAttr};
2+
use rustc_attr_data_structures::{AttributeKind, ReprAttr};
3+
use rustc_attr_parsing::AttributeParser;
34
use rustc_hir::def::{DefKind, Res};
45
use rustc_hir::intravisit::FnKind;
56
use rustc_hir::{AttrArgs, AttrItem, Attribute, GenericParamKind, PatExprKind, PatKind};

‎compiler/rustc_lint/src/types/literal.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use rustc_middle::ty::Ty;
55
use rustc_middle::ty::layout::IntegerExt;
66
use rustc_middle::{bug, ty};
77
use rustc_span::Span;
8-
use {rustc_ast as ast, rustc_attr_parsing as attr, rustc_hir as hir};
8+
use {rustc_ast as ast, rustc_attr_data_structures as attrs, rustc_hir as hir};
99

1010
use crate::LateContext;
1111
use crate::context::LintContext;
@@ -131,18 +131,18 @@ fn report_bin_hex_error(
131131
cx: &LateContext<'_>,
132132
hir_id: HirId,
133133
span: Span,
134-
ty: attr::IntType,
134+
ty: attrs::IntType,
135135
size: Size,
136136
repr_str: String,
137137
val: u128,
138138
negative: bool,
139139
) {
140140
let (t, actually) = match ty {
141-
attr::IntType::SignedInt(t) => {
141+
attrs::IntType::SignedInt(t) => {
142142
let actually = if negative { -(size.sign_extend(val)) } else { size.sign_extend(val) };
143143
(t.name_str(), actually.to_string())
144144
}
145-
attr::IntType::UnsignedInt(t) => {
145+
attrs::IntType::UnsignedInt(t) => {
146146
let actually = size.truncate(val);
147147
(t.name_str(), actually.to_string())
148148
}
@@ -264,7 +264,7 @@ fn lint_int_literal<'tcx>(
264264
cx,
265265
hir_id,
266266
span,
267-
attr::IntType::SignedInt(ty::ast_int_ty(t)),
267+
attrs::IntType::SignedInt(ty::ast_int_ty(t)),
268268
Integer::from_int_ty(cx, t).size(),
269269
repr_str,
270270
v,
@@ -336,7 +336,7 @@ fn lint_uint_literal<'tcx>(
336336
cx,
337337
hir_id,
338338
span,
339-
attr::IntType::UnsignedInt(ty::ast_uint_ty(t)),
339+
attrs::IntType::UnsignedInt(ty::ast_uint_ty(t)),
340340
Integer::from_uint_ty(cx, t).size(),
341341
repr_str,
342342
lit_val,

‎compiler/rustc_metadata/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ libloading = "0.8.0"
1010
odht = { version = "0.3.1", features = ["nightly"] }
1111
rustc_abi = { path = "../rustc_abi" }
1212
rustc_ast = { path = "../rustc_ast" }
13+
rustc_attr_data_structures = { path = "../rustc_attr_data_structures" }
1314
rustc_attr_parsing = { path = "../rustc_attr_parsing" }
1415
rustc_data_structures = { path = "../rustc_data_structures" }
1516
rustc_errors = { path = "../rustc_errors" }

‎compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::any::Any;
22
use std::mem;
33
use std::sync::Arc;
44

5-
use rustc_attr_parsing::Deprecation;
5+
use rustc_attr_data_structures::Deprecation;
66
use rustc_hir::def::{CtorKind, DefKind, Res};
77
use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, LOCAL_CRATE};
88
use rustc_hir::definitions::{DefKey, DefPath, DefPathHash};

‎compiler/rustc_metadata/src/rmeta/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ use rustc_span::hygiene::{ExpnIndex, MacroKind, SyntaxContextKey};
4040
use rustc_span::{self, ExpnData, ExpnHash, ExpnId, Ident, Span, Symbol};
4141
use rustc_target::spec::{PanicStrategy, TargetTuple};
4242
use table::TableBuilder;
43-
use {rustc_ast as ast, rustc_attr_parsing as attr, rustc_hir as hir};
43+
use {rustc_ast as ast, rustc_attr_data_structures as attrs, rustc_hir as hir};
4444

4545
use crate::creader::CrateMetadataRef;
4646

@@ -200,7 +200,7 @@ type ExpnHashTable = LazyTable<ExpnIndex, Option<LazyValue<ExpnHash>>>;
200200
#[derive(MetadataEncodable, MetadataDecodable)]
201201
pub(crate) struct ProcMacroData {
202202
proc_macro_decls_static: DefIndex,
203-
stability: Option<attr::Stability>,
203+
stability: Option<attrs::Stability>,
204204
macros: LazyArray<DefIndex>,
205205
}
206206

@@ -422,10 +422,10 @@ define_tables! {
422422
safety: Table<DefIndex, hir::Safety>,
423423
def_span: Table<DefIndex, LazyValue<Span>>,
424424
def_ident_span: Table<DefIndex, LazyValue<Span>>,
425-
lookup_stability: Table<DefIndex, LazyValue<attr::Stability>>,
426-
lookup_const_stability: Table<DefIndex, LazyValue<attr::ConstStability>>,
427-
lookup_default_body_stability: Table<DefIndex, LazyValue<attr::DefaultBodyStability>>,
428-
lookup_deprecation_entry: Table<DefIndex, LazyValue<attr::Deprecation>>,
425+
lookup_stability: Table<DefIndex, LazyValue<attrs::Stability>>,
426+
lookup_const_stability: Table<DefIndex, LazyValue<attrs::ConstStability>>,
427+
lookup_default_body_stability: Table<DefIndex, LazyValue<attrs::DefaultBodyStability>>,
428+
lookup_deprecation_entry: Table<DefIndex, LazyValue<attrs::Deprecation>>,
429429
explicit_predicates_of: Table<DefIndex, LazyValue<ty::GenericPredicates<'static>>>,
430430
generics_of: Table<DefIndex, LazyValue<ty::Generics>>,
431431
type_of: Table<DefIndex, LazyValue<ty::EarlyBinder<'static, Ty<'static>>>>,

‎compiler/rustc_resolve/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ pulldown-cmark = { version = "0.11", features = ["html"], default-features = fal
1111
rustc_arena = { path = "../rustc_arena" }
1212
rustc_ast = { path = "../rustc_ast" }
1313
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
14+
rustc_attr_data_structures = { path = "../rustc_attr_data_structures" }
1415
rustc_attr_parsing = { path = "../rustc_attr_parsing" }
1516
rustc_data_structures = { path = "../rustc_data_structures" }
1617
rustc_errors = { path = "../rustc_errors" }

‎compiler/rustc_resolve/src/macros.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::sync::Arc;
88
use rustc_ast::expand::StrippedCfgItem;
99
use rustc_ast::{self as ast, Crate, NodeId, attr};
1010
use rustc_ast_pretty::pprust;
11-
use rustc_attr_parsing::StabilityLevel;
11+
use rustc_attr_data_structures::StabilityLevel;
1212
use rustc_data_structures::intern::Interned;
1313
use rustc_errors::{Applicability, DiagCtxtHandle, StashKey};
1414
use rustc_expand::base::{

‎src/librustdoc/clean/types.rs

+8-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ use std::{fmt, iter};
55

66
use arrayvec::ArrayVec;
77
use rustc_abi::{ExternAbi, VariantIdx};
8-
use rustc_attr_parsing::{AttributeKind, ConstStability, Deprecation, Stability, StableSince};
8+
use rustc_attr_data_structures::{
9+
AttributeKind, ConstStability, Deprecation, Stability, StableSince,
10+
};
911
use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};
1012
use rustc_hir::def::{CtorKind, DefKind, Res};
1113
use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE, LocalDefId};
@@ -403,13 +405,13 @@ impl Item {
403405
// versions; the paths that are exposed through it are "deprecated" because they
404406
// were never supposed to work at all.
405407
let stab = self.stability(tcx)?;
406-
if let rustc_attr_parsing::StabilityLevel::Stable {
408+
if let rustc_attr_data_structures::StabilityLevel::Stable {
407409
allowed_through_unstable_modules: Some(note),
408410
..
409411
} = stab.level
410412
{
411413
Some(Deprecation {
412-
since: rustc_attr_parsing::DeprecatedSince::Unspecified,
414+
since: rustc_attr_data_structures::DeprecatedSince::Unspecified,
413415
note: Some(note),
414416
suggestion: None,
415417
})
@@ -777,9 +779,9 @@ impl Item {
777779
// don't want it it `Item::attrs`.
778780
None
779781
}
780-
rustc_hir::Attribute::Parsed(rustc_attr_parsing::AttributeKind::Repr(
781-
..,
782-
)) => {
782+
rustc_hir::Attribute::Parsed(
783+
rustc_attr_data_structures::AttributeKind::Repr(..),
784+
) => {
783785
// We have separate pretty-printing logic for `#[repr(..)]` attributes.
784786
// For example, there are circumstances where `#[repr(transparent)]`
785787
// is applied but should not be publicly shown in rustdoc

‎src/librustdoc/formats/cache.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::mem;
22

3-
use rustc_attr_parsing::StabilityLevel;
3+
use rustc_attr_data_structures::StabilityLevel;
44
use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap, FxIndexSet};
55
use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, DefIdSet};
66
use rustc_middle::ty::{self, TyCtxt};

‎src/librustdoc/html/format.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use std::slice;
1515

1616
use itertools::Either;
1717
use rustc_abi::ExternAbi;
18-
use rustc_attr_parsing::{ConstStability, StabilityLevel, StableSince};
18+
use rustc_attr_data_structures::{ConstStability, StabilityLevel, StableSince};
1919
use rustc_data_structures::fx::FxHashSet;
2020
use rustc_hir as hir;
2121
use rustc_hir::def::DefKind;

‎src/librustdoc/html/render/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ use std::{fs, str};
4949

5050
use askama::Template;
5151
use itertools::Either;
52-
use rustc_attr_parsing::{
52+
use rustc_attr_data_structures::{
5353
ConstStability, DeprecatedSince, Deprecation, RustcVersion, StabilityLevel, StableSince,
5454
};
5555
use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};

‎src/librustdoc/json/conversions.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use rustc_abi::ExternAbi;
88
use rustc_ast::ast;
9-
use rustc_attr_parsing::DeprecatedSince;
9+
use rustc_attr_data_structures::{self as attrs, DeprecatedSince};
1010
use rustc_hir::def::CtorKind;
1111
use rustc_hir::def_id::DefId;
1212
use rustc_metadata::rendered_const;
@@ -153,8 +153,8 @@ where
153153
}
154154
}
155155

156-
pub(crate) fn from_deprecation(deprecation: rustc_attr_parsing::Deprecation) -> Deprecation {
157-
let rustc_attr_parsing::Deprecation { since, note, suggestion: _ } = deprecation;
156+
pub(crate) fn from_deprecation(deprecation: attrs::Deprecation) -> Deprecation {
157+
let attrs::Deprecation { since, note, suggestion: _ } = deprecation;
158158
let since = match since {
159159
DeprecatedSince::RustcVersion(version) => Some(version.to_string()),
160160
DeprecatedSince::Future => Some("TBD".to_owned()),

0 commit comments

Comments
 (0)