Skip to content

Commit 159a191

Browse files
committed
Run format
1 parent 442e5c4 commit 159a191

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

compiler/rustc_passes/src/check_attr.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ use std::collections::hash_map::Entry;
1010
use rustc_ast::token::TokenKind;
1111
use rustc_ast::tokenstream::TokenTree;
1212
use rustc_ast::{
13-
AttrKind, AttrStyle, Attribute, LitKind, MetaItemInner, MetaItemKind, MetaItemLit, ast,
14-
token::TokenKind, tokenstream::TokenTree, AttrKind, AttrStyle, Attribute, LitKind,
15-
MetaItemKind, MetaItemLit, NestedMetaItem,
13+
AttrKind, AttrStyle, AttrStyle, Attribute, Attribute, LitKind, LitKind, MetaItemInner,
14+
MetaItemKind, MetaItemKind, MetaItemLit, MetaItemLit, NestedMetaItem, ast,
1615
};
1716
use rustc_data_structures::fx::FxHashMap;
1817
use rustc_errors::{Applicability, DiagCtxtHandle, IntoDiagArg, MultiSpan, StashKey};
@@ -2404,6 +2403,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
24042403
_ => {
24052404
self.dcx().emit_err(errors::AutoDiffAttr { attr_span: span });
24062405
self.abort.set(true);
2406+
}
24072407
}
24082408
}
24092409

compiler/rustc_passes/src/errors.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rustc_errors::{
1010
use rustc_hir::{self as hir, ExprKind, Target};
1111
use rustc_macros::{Diagnostic, LintDiagnostic, Subdiagnostic};
1212
use rustc_middle::ty::{MainDefinition, Ty};
13-
use rustc_span::{Span, Symbol, DUMMY_SP};
13+
use rustc_span::{DUMMY_SP, Span, Symbol};
1414

1515
use crate::check_attr::ProcMacroKind;
1616
use crate::fluent_generated as fluent;
@@ -1377,15 +1377,11 @@ pub(crate) struct DuplicateLangItem {
13771377
impl<G: EmissionGuarantee> Diagnostic<'_, G> for DuplicateLangItem {
13781378
#[track_caller]
13791379
fn into_diag(self, dcx: DiagCtxtHandle<'_>, level: Level) -> Diag<'_, G> {
1380-
let mut diag = Diag::new(
1381-
dcx,
1382-
level,
1383-
match self.duplicate {
1384-
Duplicate::Plain => fluent::passes_duplicate_lang_item,
1385-
Duplicate::Crate => fluent::passes_duplicate_lang_item_crate,
1386-
Duplicate::CrateDepends => fluent::passes_duplicate_lang_item_crate_depends,
1387-
},
1388-
);
1380+
let mut diag = Diag::new(dcx, level, match self.duplicate {
1381+
Duplicate::Plain => fluent::passes_duplicate_lang_item,
1382+
Duplicate::Crate => fluent::passes_duplicate_lang_item_crate,
1383+
Duplicate::CrateDepends => fluent::passes_duplicate_lang_item_crate_depends,
1384+
});
13891385
diag.code(E0152);
13901386
diag.arg("lang_item_name", self.lang_item_name);
13911387
diag.arg("crate_name", self.crate_name);

0 commit comments

Comments
 (0)