Skip to content

Commit f0e9bd9

Browse files
committed
address nits
1 parent d38aab3 commit f0e9bd9

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/librustc/middle/traits/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,9 @@ pub enum Vtable<'tcx, N> {
222222
VtableImpl(VtableImplData<'tcx, N>),
223223

224224
/// Vtable for default trait implementations
225+
/// This carries the information and nested obligations with regards
226+
/// to a default implementation for a trait `Trait`. The nested obligations
227+
/// ensure the trait implementation holds for all the constituent types.
225228
VtableDefaultImpl(VtableDefaultImplData<N>),
226229

227230
/// Successful resolution to an obligation provided by the caller

src/librustc/middle/traits/util.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,8 @@ pub fn trait_ref_for_builtin_bound<'tcx>(
323323
}
324324
}
325325

326+
326327
pub fn predicate_for_trait_ref<'tcx>(
327-
tcx: &ty::ctxt<'tcx>,
328328
cause: ObligationCause<'tcx>,
329329
trait_ref: Rc<ty::TraitRef<'tcx>>,
330330
recursion_depth: uint)
@@ -349,7 +349,7 @@ pub fn predicate_for_default_trait_impl<'tcx>(
349349
def_id: trait_def_id,
350350
substs: tcx.mk_substs(Substs::empty().with_self_ty(param_ty))
351351
});
352-
predicate_for_trait_ref(tcx, cause, trait_ref, recursion_depth)
352+
predicate_for_trait_ref(cause, trait_ref, recursion_depth)
353353
}
354354

355355
pub fn predicate_for_builtin_bound<'tcx>(
@@ -361,7 +361,7 @@ pub fn predicate_for_builtin_bound<'tcx>(
361361
-> Result<PredicateObligation<'tcx>, ErrorReported>
362362
{
363363
let trait_ref = try!(trait_ref_for_builtin_bound(tcx, builtin_bound, param_ty));
364-
predicate_for_trait_ref(tcx, cause, trait_ref, recursion_depth)
364+
predicate_for_trait_ref(cause, trait_ref, recursion_depth)
365365
}
366366

367367
/// Cast a trait reference into a reference to one of its super

0 commit comments

Comments
 (0)