Skip to content

Commit 2811eff

Browse files
committed
Add imports_granularity = "Module" to rustfmt.toml
1 parent 631faa1 commit 2811eff

File tree

279 files changed

+990
-1055
lines changed

Some content is hidden

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

279 files changed

+990
-1055
lines changed

clippy_lints/src/allow_attributes.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use ast::{AttrStyle, Attribute};
2-
use clippy_utils::{diagnostics::span_lint_and_sugg, is_from_proc_macro};
2+
use clippy_utils::diagnostics::span_lint_and_sugg;
3+
use clippy_utils::is_from_proc_macro;
34
use rustc_ast as ast;
45
use rustc_errors::Applicability;
56
use rustc_lint::{LateContext, LateLintPass, LintContext};

clippy_lints/src/arc_with_non_send_sync.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ use clippy_utils::diagnostics::span_lint_and_then;
22
use clippy_utils::last_path_segment;
33
use clippy_utils::ty::{implements_trait, is_type_diagnostic_item};
44
use rustc_hir::{Expr, ExprKind};
5-
use rustc_lint::LateContext;
6-
use rustc_lint::LateLintPass;
5+
use rustc_lint::{LateContext, LateLintPass};
76
use rustc_middle::ty;
87
use rustc_middle::ty::print::with_forced_trimmed_paths;
98
use rustc_middle::ty::GenericArgKind;

clippy_lints/src/attrs.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
//! checks for attributes
22
3+
use clippy_utils::diagnostics::{span_lint, span_lint_and_help, span_lint_and_sugg, span_lint_and_then};
4+
use clippy_utils::is_from_proc_macro;
35
use clippy_utils::macros::{is_panic, macro_backtrace};
46
use clippy_utils::msrvs::{self, Msrv};
57
use clippy_utils::source::{first_line_of_span, is_present_in_source, snippet_opt, without_block_comments};
6-
use clippy_utils::{
7-
diagnostics::{span_lint, span_lint_and_help, span_lint_and_sugg, span_lint_and_then},
8-
is_from_proc_macro,
9-
};
108
use if_chain::if_chain;
119
use rustc_ast::{AttrKind, AttrStyle, Attribute, LitKind, MetaItemKind, MetaItemLit, NestedMetaItem};
1210
use rustc_errors::Applicability;

clippy_lints/src/blocks_in_if_conditions.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
use clippy_utils::diagnostics::{span_lint, span_lint_and_sugg};
2-
use clippy_utils::get_parent_expr;
3-
use clippy_utils::higher;
42
use clippy_utils::source::snippet_block_with_applicability;
53
use clippy_utils::ty::implements_trait;
64
use clippy_utils::visitors::{for_each_expr, Descend};
5+
use clippy_utils::{get_parent_expr, higher};
76
use core::ops::ControlFlow;
87
use if_chain::if_chain;
98
use rustc_errors::Applicability;

clippy_lints/src/bool_to_int_with_if.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ use rustc_hir::{Block, ExprKind};
44
use rustc_lint::{LateContext, LateLintPass};
55
use rustc_session::{declare_lint_pass, declare_tool_lint};
66

7-
use clippy_utils::{diagnostics::span_lint_and_then, in_constant, is_else_clause, is_integer_literal, sugg::Sugg};
7+
use clippy_utils::diagnostics::span_lint_and_then;
8+
use clippy_utils::sugg::Sugg;
9+
use clippy_utils::{in_constant, is_else_clause, is_integer_literal};
810
use rustc_errors::Applicability;
911

1012
declare_clippy_lint! {

clippy_lints/src/borrow_deref_ref.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
use crate::reference::DEREF_ADDROF;
22
use clippy_utils::diagnostics::span_lint_and_then;
3-
use clippy_utils::is_from_proc_macro;
43
use clippy_utils::source::snippet_opt;
54
use clippy_utils::ty::implements_trait;
6-
use clippy_utils::{get_parent_expr, is_lint_allowed};
5+
use clippy_utils::{get_parent_expr, is_from_proc_macro, is_lint_allowed};
76
use rustc_errors::Applicability;
87
use rustc_hir::{ExprKind, UnOp};
98
use rustc_lint::{LateContext, LateLintPass};

clippy_lints/src/box_default.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
use clippy_utils::{
2-
diagnostics::span_lint_and_sugg, get_parent_node, is_default_equivalent, macros::macro_backtrace, match_path,
3-
path_def_id, paths, ty::expr_sig,
4-
};
1+
use clippy_utils::diagnostics::span_lint_and_sugg;
2+
use clippy_utils::macros::macro_backtrace;
3+
use clippy_utils::ty::expr_sig;
4+
use clippy_utils::{get_parent_node, is_default_equivalent, match_path, path_def_id, paths};
55
use rustc_errors::Applicability;
6-
use rustc_hir::{
7-
intravisit::{walk_ty, Visitor},
8-
Block, Expr, ExprKind, Local, Node, QPath, TyKind,
9-
};
6+
use rustc_hir::intravisit::{walk_ty, Visitor};
7+
use rustc_hir::{Block, Expr, ExprKind, Local, Node, QPath, TyKind};
108
use rustc_lint::{LateContext, LateLintPass, LintContext};
119
use rustc_middle::lint::in_external_macro;
1210
use rustc_middle::ty::print::with_forced_trimmed_paths;

clippy_lints/src/casts/as_ptr_cast_mut.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ use clippy_utils::source::snippet_opt;
33
use rustc_errors::Applicability;
44
use rustc_hir::{Expr, ExprKind};
55
use rustc_lint::LateContext;
6-
use rustc_middle::{
7-
mir::Mutability,
8-
ty::{self, Ty, TypeAndMut},
9-
};
6+
use rustc_middle::mir::Mutability;
7+
use rustc_middle::ty::{self, Ty, TypeAndMut};
108

119
use super::AS_PTR_CAST_MUT;
1210

clippy_lints/src/casts/cast_slice_different_sizes.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
use clippy_utils::diagnostics::span_lint_and_then;
12
use clippy_utils::msrvs::{self, Msrv};
2-
use clippy_utils::{diagnostics::span_lint_and_then, source};
3+
use clippy_utils::source;
34
use if_chain::if_chain;
45
use rustc_ast::Mutability;
56
use rustc_hir::{Expr, ExprKind, Node};
67
use rustc_lint::LateContext;
7-
use rustc_middle::ty::{self, layout::LayoutOf, Ty, TypeAndMut};
8+
use rustc_middle::ty::layout::LayoutOf;
9+
use rustc_middle::ty::{self, Ty, TypeAndMut};
810

911
use super::CAST_SLICE_DIFFERENT_SIZES;
1012

clippy_lints/src/casts/cast_slice_from_raw_parts.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ use clippy_utils::source::snippet_with_context;
44
use clippy_utils::{match_def_path, paths};
55
use if_chain::if_chain;
66
use rustc_errors::Applicability;
7-
use rustc_hir::{def_id::DefId, Expr, ExprKind};
7+
use rustc_hir::def_id::DefId;
8+
use rustc_hir::{Expr, ExprKind};
89
use rustc_lint::LateContext;
910
use rustc_middle::ty::{self, Ty};
1011

0 commit comments

Comments
 (0)