diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-18 18:02:58 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-19 07:03:18 -0800 |
| commit | 0cd54b85ef1fdad3bc4c1c4e1a989b9f6540a0fa (patch) | |
| tree | b2973ab6fdb99ec1d3ff8fd930f29cf78da183f4 /src/test | |
| parent | cb29c468f38ba93f624277c2c3a8e46a4d85e619 (diff) | |
| download | rust-0cd54b85ef1fdad3bc4c1c4e1a989b9f6540a0fa.tar.gz rust-0cd54b85ef1fdad3bc4c1c4e1a989b9f6540a0fa.zip | |
Round 5 test fixes and rebase conflicts
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/compile-fail/regions-assoc-type-outlives-container-hrtb.rs | 2 | ||||
| -rw-r--r-- | src/test/run-make/save-analysis/foo.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/compile-fail/regions-assoc-type-outlives-container-hrtb.rs b/src/test/compile-fail/regions-assoc-type-outlives-container-hrtb.rs index dd89e0e038b..9736910d7b5 100644 --- a/src/test/compile-fail/regions-assoc-type-outlives-container-hrtb.rs +++ b/src/test/compile-fail/regions-assoc-type-outlives-container-hrtb.rs @@ -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; } diff --git a/src/test/run-make/save-analysis/foo.rs b/src/test/run-make/save-analysis/foo.rs index b6366ad6737..38381da3670 100644 --- a/src/test/run-make/save-analysis/foo.rs +++ b/src/test/run-make/save-analysis/foo.rs @@ -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. |