Skip to content

Commit 9ac1a6b

Browse files
committed
formatting
1 parent de23c4e commit 9ac1a6b

File tree

3 files changed

+12
-23
lines changed

3 files changed

+12
-23
lines changed

compiler/rustc_trait_selection/src/errors.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ pub struct AutoDerefReachedRecursionLimit {
3535
pub struct EmptyOnClauseInOnUnimplemented {
3636
#[primary_span]
3737
#[label(trait_selection::empty_on_clause_in_rustc_on_unimplemented_label)]
38-
pub span: Span
38+
pub span: Span,
3939
}
4040

4141
#[derive(SessionDiagnostic)]
4242
#[error(trait_selection::invalid_on_clause_in_rustc_on_unimplemented, code = "E0232")]
4343
pub struct InvalidOnClauseInOnUnimplemented {
4444
#[primary_span]
4545
#[label(trait_selection::invalid_on_clause_in_rustc_on_unimplemented_label)]
46-
pub span: Span
46+
pub span: Span,
4747
}
4848

4949
#[derive(SessionDiagnostic)]
@@ -52,5 +52,5 @@ pub struct NoValueInOnUnimplemented {
5252
#[primary_span]
5353
#[label(trait_selection::no_value_in_rustc_on_unimplemented_label)]
5454
#[note(trait_selection::no_value_in_rustc_on_unimplemented_note)]
55-
pub span: Span
55+
pub span: Span,
5656
}

compiler/rustc_trait_selection/src/traits/auto_trait.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -831,12 +831,11 @@ impl<'tcx> AutoTraitFinder<'tcx> {
831831
Ok(None) => {
832832
let tcx = self.tcx;
833833
let def_id = unevaluated.def.did;
834-
let reported = tcx.sess.emit_err(
835-
UnableToConstructConstantValue {
834+
let reported =
835+
tcx.sess.emit_err(UnableToConstructConstantValue {
836836
span: tcx.def_span(def_id),
837837
unevaluated: format!("{:?}", unevaluated),
838-
},
839-
);
838+
});
840839
Err(ErrorHandled::Reported(reported))
841840
}
842841
Err(err) => Err(err),

compiler/rustc_trait_selection/src/traits/on_unimplemented.rs

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ use rustc_parse_format::{ParseMode, Parser, Piece, Position};
88
use rustc_span::symbol::{kw, sym, Symbol};
99
use rustc_span::{Span, DUMMY_SP};
1010

11-
use crate::errors::{EmptyOnClauseInOnUnimplemented, InvalidOnClauseInOnUnimplemented, NoValueInOnUnimplemented};
11+
use crate::errors::{
12+
EmptyOnClauseInOnUnimplemented, InvalidOnClauseInOnUnimplemented, NoValueInOnUnimplemented,
13+
};
1214

1315
#[derive(Clone, Debug)]
1416
pub struct OnUnimplementedFormatString(Symbol);
@@ -57,17 +59,9 @@ impl<'tcx> OnUnimplementedDirective {
5759
} else {
5860
let cond = item_iter
5961
.next()
60-
.ok_or_else(|| {
61-
tcx.sess.emit_err(EmptyOnClauseInOnUnimplemented {
62-
span
63-
})
64-
})?
62+
.ok_or_else(|| tcx.sess.emit_err(EmptyOnClauseInOnUnimplemented { span }))?
6563
.meta_item()
66-
.ok_or_else(|| {
67-
tcx.sess.emit_err(InvalidOnClauseInOnUnimplemented {
68-
span
69-
})
70-
})?;
64+
.ok_or_else(|| tcx.sess.emit_err(InvalidOnClauseInOnUnimplemented { span }))?;
7165
attr::eval_condition(cond, &tcx.sess.parse_sess, Some(tcx.features()), &mut |cfg| {
7266
if let Some(value) = cfg.value && let Err(guar) = parse_value(value) {
7367
errored = Some(guar);
@@ -129,11 +123,7 @@ impl<'tcx> OnUnimplementedDirective {
129123
}
130124

131125
// nothing found
132-
tcx.sess.emit_err(
133-
NoValueInOnUnimplemented {
134-
span: item.span(),
135-
}
136-
);
126+
tcx.sess.emit_err(NoValueInOnUnimplemented { span: item.span() });
137127
}
138128

139129
if let Some(reported) = errored {

0 commit comments

Comments
 (0)