Skip to content

Commit 8e6771d

Browse files
committed
fix clippy
1 parent 16d9c6b commit 8e6771d

File tree

6 files changed

+13
-18
lines changed

6 files changed

+13
-18
lines changed

compiler/rustc_attr_data_structures/src/attributes.rs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -216,25 +216,20 @@ pub enum AttributeKind {
216216
ConstStabilityIndirect,
217217

218218
/// Represents [`#[deprecated]`](https://doc.rust-lang.org/stable/reference/attributes/diagnostics.html#the-deprecated-attribute).
219-
Deprecation {
220-
deprecation: Deprecation,
221-
span: Span,
222-
},
219+
Deprecation { deprecation: Deprecation, span: Span },
223220

224221
/// Represents [`#[doc]`](https://doc.rust-lang.org/stable/rustdoc/write-documentation/the-doc-attribute.html).
225-
DocComment {
226-
style: AttrStyle,
227-
kind: CommentKind,
228-
span: Span,
229-
comment: Symbol,
230-
},
222+
DocComment { style: AttrStyle, kind: CommentKind, span: Span, comment: Symbol },
231223

232-
/// Represents `#[rustc_macro_transparency]`.
224+
/// Represents `#[inline]` and `#[rustc_force_inline]`.
233225
Inline(InlineAttr, Span),
226+
227+
/// Represents `#[rustc_macro_transparency]`.
234228
MacroTransparency(Transparency),
235229

236230
/// Represents [`#[repr]`](https://doc.rust-lang.org/stable/reference/type-layout.html#representations).
237231
Repr(ThinVec<(ReprAttr, Span)>),
232+
238233
/// Represents `#[stable]`, `#[unstable]` and `#[rustc_allowed_through_unstable_modules]`.
239234
Stability {
240235
stability: Stability,

src/tools/clippy/clippy_lints/src/attrs/inline_always.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::INLINE_ALWAYS;
22
use clippy_utils::diagnostics::span_lint;
3-
use rustc_attr_parsing::{find_attr, AttributeKind, InlineAttr};
3+
use rustc_attr_data_structures::{find_attr, AttributeKind, InlineAttr};
44
use rustc_hir::Attribute;
55
use rustc_lint::LateContext;
66
use rustc_span::symbol::Symbol;

src/tools/clippy/clippy_lints/src/inline_fn_without_body.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use clippy_utils::diagnostics::span_lint_and_then;
22
use clippy_utils::sugg::DiagExt;
3-
use rustc_attr_parsing::{find_attr, AttributeKind};
3+
use rustc_attr_data_structures::{find_attr, AttributeKind};
44
use rustc_errors::Applicability;
55
use rustc_hir::{TraitFn, TraitItem, TraitItemKind};
66
use rustc_lint::{LateContext, LateLintPass};

src/tools/clippy/clippy_lints/src/missing_inline.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use clippy_utils::diagnostics::span_lint;
2-
use rustc_attr_parsing::{find_attr, AttributeKind};
2+
use rustc_attr_data_structures::{find_attr, AttributeKind};
33
use rustc_hir as hir;
44
use rustc_hir::Attribute;
55
use rustc_lint::{LateContext, LateLintPass, LintContext};

src/tools/clippy/clippy_lints/src/pass_by_ref_or_value.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use clippy_utils::diagnostics::span_lint_and_sugg;
33
use clippy_utils::source::snippet;
44
use clippy_utils::ty::{for_each_top_level_late_bound_region, is_copy};
55
use clippy_utils::{is_self, is_self_ty};
6-
use rustc_attr_parsing::{find_attr, AttributeKind, InlineAttr};
6+
use rustc_attr_data_structures::{find_attr, AttributeKind, InlineAttr};
77
use rustc_data_structures::fx::FxHashSet;
88
use core::ops::ControlFlow;
99
use rustc_abi::ExternAbi;

tests/rustdoc-json/attrs/inline.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
//@ is "$.index[?(@.name=='just_inline')].attrs" '["#[inline]"]'
1+
//@ is "$.index[?(@.name=='just_inline')].attrs" '["#[attr = Inline(Hint)]"]'
22
#[inline]
33
pub fn just_inline() {}
44

5-
//@ is "$.index[?(@.name=='inline_always')].attrs" '["#[inline(always)]"]'
5+
//@ is "$.index[?(@.name=='inline_always')].attrs" '["#[attr = Inline(Always)]"]'
66
#[inline(always)]
77
pub fn inline_always() {}
88

9-
//@ is "$.index[?(@.name=='inline_never')].attrs" '["#[inline(never)]"]'
9+
//@ is "$.index[?(@.name=='inline_never')].attrs" '["#[attr = Inline(Never)]"]'
1010
#[inline(never)]
1111
pub fn inline_never() {}

0 commit comments

Comments
 (0)