Skip to content

Commit 57e5ae2

Browse files
Tidy
1 parent 3988e4a commit 57e5ae2

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

src/librustc/middle/infer/higher_ranked/mod.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,16 @@ use syntax::codemap::Span;
2121
use util::nodemap::{FnvHashMap, FnvHashSet};
2222

2323
pub trait HigherRankedRelations<'a,'tcx> {
24-
fn higher_ranked_sub<T>(&mut self, a: &Binder<T>, b: &Binder<T>) -> RelateResult<'tcx, Binder<T>>
24+
fn higher_ranked_sub<T>(&mut self, a: &Binder<T>, b: &Binder<T>)
25+
-> RelateResult<'tcx, Binder<T>>
2526
where T: Relate<'a,'tcx>;
2627

27-
fn higher_ranked_lub<T>(&mut self, a: &Binder<T>, b: &Binder<T>) -> RelateResult<'tcx, Binder<T>>
28+
fn higher_ranked_lub<T>(&mut self, a: &Binder<T>, b: &Binder<T>)
29+
-> RelateResult<'tcx, Binder<T>>
2830
where T: Relate<'a,'tcx>;
2931

30-
fn higher_ranked_glb<T>(&mut self, a: &Binder<T>, b: &Binder<T>) -> RelateResult<'tcx, Binder<T>>
32+
fn higher_ranked_glb<T>(&mut self, a: &Binder<T>, b: &Binder<T>)
33+
-> RelateResult<'tcx, Binder<T>>
3134
where T: Relate<'a,'tcx>;
3235
}
3336

@@ -101,7 +104,8 @@ impl<'a,'o,'tcx> HigherRankedRelations<'a,'tcx> for CombineFields<'a,'o,'tcx> {
101104
});
102105
}
103106

104-
fn higher_ranked_lub<T>(&mut self, a: &Binder<T>, b: &Binder<T>) -> RelateResult<'tcx, Binder<T>>
107+
fn higher_ranked_lub<T>(&mut self, a: &Binder<T>, b: &Binder<T>)
108+
-> RelateResult<'tcx, Binder<T>>
105109
where T: Relate<'a,'tcx>
106110
{
107111
// Start a snapshot so we can examine "all bindings that were
@@ -191,7 +195,8 @@ impl<'a,'o,'tcx> HigherRankedRelations<'a,'tcx> for CombineFields<'a,'o,'tcx> {
191195
}
192196
}
193197

194-
fn higher_ranked_glb<T>(&mut self, a: &Binder<T>, b: &Binder<T>) -> RelateResult<'tcx, Binder<T>>
198+
fn higher_ranked_glb<T>(&mut self, a: &Binder<T>, b: &Binder<T>)
199+
-> RelateResult<'tcx, Binder<T>>
195200
where T: Relate<'a,'tcx>
196201
{
197202
debug!("higher_ranked_glb({:?}, {:?})",

src/librustc_typeck/check/regionck.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ use middle::region::{self, CodeExtent};
9292
use middle::subst::Substs;
9393
use middle::traits;
9494
use middle::ty::{self, Ty, MethodCall, TypeFoldable};
95-
use middle::infer::{self, GenericKind, InferCtxt, SubregionOrigin, TypeOrigin, VerifyBound, InferOk};
95+
use middle::infer::{self, GenericKind, InferCtxt, SubregionOrigin, TypeOrigin, VerifyBound,
96+
InferOk};
9697
use middle::pat_util;
9798
use middle::ty::adjustment;
9899
use middle::ty::wf::ImpliedBound;

0 commit comments

Comments
 (0)