Skip to content

Commit 7ccf5d4

Browse files
committedJul 13, 2023
Auto merge of rust-lang#11095 - Alexendoo:rustfmt-imports, r=Manishearth
Add `imports_granularity = "Module"` to rustfmt.toml This lets rustfmt split/merge imports, `Module` seems to be the most common style in clippy https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#imports_granularity changelog: none Almost all the updates other than the config file change are from `cargo dev fmt` or blessed tests, the exceptions being - `tests/ui/single_component_path_imports.rs` - `tests/ui/single_component_path_imports_nested_first.rs` - `tests/ui/single_component_path_imports_self_after.rs` - `tests/ui/single_component_path_imports_self_before.rs` - `tests/ui/unsafe_removed_from_name.rs` (added a test with merged imports as a drive by) - `tests/ui/wildcard_imports.rs` - `tests/ui/wildcard_imports_2021.rs`
2 parents a0e8257 + 2811eff commit 7ccf5d4

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;

0 commit comments

Comments
 (0)
Please sign in to comment.