user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Round 5 test fixes and rebase conflicts

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
src/test/compile-fail/regions-assoc-type-outlives-container-hrtb.rs
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;
}

2
src/test/run-make/save-analysis/foo.rs
View file

@ -34,7 +34,7 @@ use std::mem::size_of;
static uni: &'static str = "Les Miséééééééérables";
static yy: usize = 25;
static bob: Option<std::borrow::Cow<'static, [isize]>> = None;
static bob: Option<&'static [isize]> = None;
// buglink test - see issue #1337.