Skip to content

Commit 736e55b

Browse files
committed
Auto merge of #141238 - Zalathar:rollup-zdqpazo, r=Zalathar
Rollup of 4 pull requests Successful merges: - #140049 (fix autodiff macro on generic functions) - #140874 (make `rustc_attr_parsing` less dominant in the rustc crate graph) - #141094 (add regression test for rust-lang#101650) - #141110 ([std] fix the presentation of `split_off_mut` and `split_off` documentation) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 732d413 + 75bbc24 commit 736e55b

File tree

14 files changed

+17
-14
lines changed

14 files changed

+17
-14
lines changed

clippy_lints/src/approx_const.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use clippy_config::Conf;
22
use clippy_utils::diagnostics::span_lint_and_help;
33
use clippy_utils::msrvs::{self, Msrv};
44
use rustc_ast::ast::{FloatTy, LitFloatType, LitKind};
5-
use rustc_attr_parsing::RustcVersion;
5+
use rustc_attr_data_structures::RustcVersion;
66
use rustc_hir::{HirId, Lit};
77
use rustc_lint::{LateContext, LateLintPass};
88
use rustc_session::impl_lint_pass;

clippy_lints/src/attrs/repr_attributes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use rustc_attr_parsing::{AttributeKind, ReprAttr, find_attr};
1+
use rustc_attr_data_structures::{AttributeKind, ReprAttr, find_attr};
22
use rustc_hir::Attribute;
33
use rustc_lint::LateContext;
44
use rustc_span::Span;

clippy_lints/src/booleans.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use clippy_utils::source::SpanRangeExt;
66
use clippy_utils::sugg::Sugg;
77
use clippy_utils::ty::{implements_trait, is_type_diagnostic_item};
88
use rustc_ast::ast::LitKind;
9-
use rustc_attr_parsing::RustcVersion;
9+
use rustc_attr_data_structures::RustcVersion;
1010
use rustc_errors::Applicability;
1111
use rustc_hir::intravisit::{FnKind, Visitor, walk_expr};
1212
use rustc_hir::{BinOpKind, Body, Expr, ExprKind, FnDecl, UnOp};

clippy_lints/src/default_union_representation.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_and_then;
2-
use rustc_attr_parsing::{AttributeKind, ReprAttr, find_attr};
2+
use rustc_attr_data_structures::{AttributeKind, ReprAttr, find_attr};
33
use rustc_hir::{HirId, Item, ItemKind};
44
use rustc_lint::{LateContext, LateLintPass};
55
use rustc_middle::ty::layout::LayoutOf;

clippy_lints/src/doc/suspicious_doc_comments.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_utils::diagnostics::span_lint_and_then;
22
use rustc_ast::AttrStyle;
33
use rustc_ast::token::CommentKind;
4-
use rustc_attr_parsing::AttributeKind;
4+
use rustc_attr_data_structures::AttributeKind;
55
use rustc_errors::Applicability;
66
use rustc_hir::Attribute;
77
use rustc_lint::LateContext;

clippy_lints/src/doc/too_long_first_doc_paragraph.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use rustc_attr_parsing::AttributeKind;
1+
use rustc_attr_data_structures::AttributeKind;
22
use rustc_errors::Applicability;
33
use rustc_hir::{Attribute, Item, ItemKind};
44
use rustc_lint::LateContext;

clippy_lints/src/format_args.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use rustc_ast::{
1515
FormatArgPosition, FormatArgPositionKind, FormatArgsPiece, FormatArgumentKind, FormatCount, FormatOptions,
1616
FormatPlaceholder, FormatTrait,
1717
};
18-
use rustc_attr_parsing::RustcVersion;
18+
use rustc_attr_data_structures::RustcVersion;
1919
use rustc_data_structures::fx::FxHashMap;
2020
use rustc_errors::Applicability;
2121
use rustc_errors::SuggestionStyle::{CompletelyHidden, ShowCode};

clippy_lints/src/incompatible_msrv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use clippy_config::Conf;
22
use clippy_utils::diagnostics::span_lint;
33
use clippy_utils::is_in_test;
44
use clippy_utils::msrvs::Msrv;
5-
use rustc_attr_parsing::{RustcVersion, StabilityLevel, StableSince};
5+
use rustc_attr_data_structures::{RustcVersion, StabilityLevel, StableSince};
66
use rustc_data_structures::fx::FxHashMap;
77
use rustc_hir::{Expr, ExprKind, HirId, QPath};
88
use rustc_lint::{LateContext, LateLintPass};

clippy_lints/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ extern crate rustc_abi;
3535
extern crate rustc_arena;
3636
extern crate rustc_ast;
3737
extern crate rustc_ast_pretty;
38-
extern crate rustc_attr_parsing;
38+
extern crate rustc_attr_data_structures;
3939
extern crate rustc_data_structures;
4040
extern crate rustc_driver;
4141
extern crate rustc_errors;

clippy_lints/src/std_instead_of_core.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use clippy_config::Conf;
22
use clippy_utils::diagnostics::span_lint_and_then;
33
use clippy_utils::is_from_proc_macro;
44
use clippy_utils::msrvs::Msrv;
5-
use rustc_attr_parsing::{StabilityLevel, StableSince};
5+
use rustc_attr_data_structures::{StabilityLevel, StableSince};
66
use rustc_errors::Applicability;
77
use rustc_hir::def::Res;
88
use rustc_hir::def_id::DefId;

0 commit comments

Comments
 (0)