Skip to content

Commit 05a6e1e

Browse files
committed
pacify the mercilous tidy
1 parent 7e1b978 commit 05a6e1e

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/librustc_mir/borrow_check/nll/type_check/relate_tys.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,10 @@ impl<'cx, 'bccx, 'gcx, 'tcx> TypeRelation<'cx, 'gcx, 'tcx>
547547

548548
// Reset ambient variance to contravariance. See the
549549
// covariant case above for an explanation.
550-
let variance = ::std::mem::replace(&mut self.ambient_variance, ty::Variance::Contravariant);
550+
let variance = ::std::mem::replace(
551+
&mut self.ambient_variance,
552+
ty::Variance::Contravariant,
553+
);
551554

552555
self.relate(a.skip_binder(), b.skip_binder())?;
553556

@@ -629,7 +632,7 @@ impl<'cx, 'gcx, 'tcx> TypeVisitor<'tcx> for ScopeInstantiator<'cx, 'gcx, 'tcx> {
629632
/// so that the resulting generalized type is independent from the
630633
/// scopes.
631634
///
632-
/// [blog post]: http://smallcultfollowing.com/babysteps/blog/2014/07/09/an-experimental-new-type-inference-scheme-for-rust/
635+
/// [blog post]: https://is.gd/0hKvIr
633636
struct TypeGeneralizer<'me, 'bccx: 'me, 'gcx: 'tcx, 'tcx: 'bccx> {
634637
type_rel: &'me TypeRelating<'me, 'bccx, 'gcx, 'tcx>,
635638

src/librustc_mir/hair/pattern/_match.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1235,7 +1235,8 @@ fn pat_constructors<'tcx>(cx: &mut MatchCheckCtxt,
12351235
-> Option<Vec<Constructor<'tcx>>>
12361236
{
12371237
match *pat.kind {
1238-
PatternKind::AscribeUserType { ref subpattern, .. } => pat_constructors(cx, subpattern, pcx),
1238+
PatternKind::AscribeUserType { ref subpattern, .. } =>
1239+
pat_constructors(cx, subpattern, pcx),
12391240
PatternKind::Binding { .. } | PatternKind::Wild => None,
12401241
PatternKind::Leaf { .. } | PatternKind::Deref { .. } => Some(vec![Single]),
12411242
PatternKind::Variant { adt_def, variant_index, .. } => {

0 commit comments

Comments
 (0)