Round 5 test fixes and rebase conflicts

This commit is contained in:
Alex Crichton 2015-02-18 18:02:58 -08:00
parent cb29c468f3
commit 0cd54b85ef
8 changed files with 52 additions and 10 deletions

View file

@ -18,7 +18,7 @@ use std::marker::PhantomFn;
///////////////////////////////////////////////////////////////////////////
pub trait TheTrait<'b> : PhantomFn<Self,Self> {
pub trait TheTrait<'b> : PhantomFn<&'b Self,Self> {
type TheAssocType;
}