Skip to content

Commit c217711

Browse files
committed
Tweak code formatting
1 parent 9e34664 commit c217711

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

src/librustc/traits/error_reporting.rs

+10-6
Original file line numberDiff line numberDiff line change
@@ -711,20 +711,24 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
711711
}
712712
match obligation.predicate {
713713
ty::Predicate::Trait(ref trait_predicate) => {
714-
let trait_predicate =
715-
self.resolve_vars_if_possible(trait_predicate);
714+
let trait_predicate = self.resolve_vars_if_possible(trait_predicate);
716715

717716
if self.tcx.sess.has_errors() && trait_predicate.references_error() {
718717
return;
719718
}
720719
let trait_ref = trait_predicate.to_poly_trait_ref();
721-
let (post_message, pre_message) =
722-
self.get_parent_trait_ref(&obligation.cause.code)
720+
let (
721+
post_message,
722+
pre_message,
723+
) = self.get_parent_trait_ref(&obligation.cause.code)
723724
.map(|t| (format!(" in `{}`", t), format!("within `{}`, ", t)))
724725
.unwrap_or_default();
725726

726-
let OnUnimplementedNote { message, label, note }
727-
= self.on_unimplemented_note(trait_ref, obligation);
727+
let OnUnimplementedNote {
728+
message,
729+
label,
730+
note,
731+
} = self.on_unimplemented_note(trait_ref, obligation);
728732
let have_alt_message = message.is_some() || label.is_some();
729733
let is_try = self.tcx.sess.source_map().span_to_snippet(span)
730734
.map(|s| &s == "?")

src/librustc_errors/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ use syntax_pos::{
4848
Span,
4949
SpanSnippetError,
5050
};
51+
pub use snippet::Style;
5152

5253
pub type PResult<'a, T> = Result<T, DiagnosticBuilder<'a>>;
5354

0 commit comments

Comments
 (0)