diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-02 10:58:10 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-02 11:13:05 -0800 |
| commit | 4459b1dcedc5b0cb195c2494beda56b87105a980 (patch) | |
| tree | 8de1b3e206541d31e6697aa5466e9fabff223cbd /src/test/debuginfo | |
| parent | e921e3f04513ffb094208a538a2835d4dc77b991 (diff) | |
| parent | 704ed4c7d00d256b783086a682fbcfd7a4ac5c5a (diff) | |
| download | rust-4459b1dcedc5b0cb195c2494beda56b87105a980.tar.gz rust-4459b1dcedc5b0cb195c2494beda56b87105a980.zip | |
rollup merge of #20341: nikomatsakis/impl-trait-for-trait-2
Conflicts: src/librustc/middle/traits/mod.rs src/libstd/io/mod.rs src/test/run-pass/builtin-superkinds-self-type.rs
Diffstat (limited to 'src/test/debuginfo')
| -rw-r--r-- | src/test/debuginfo/issue7712.rs | 2 | ||||
| -rw-r--r-- | src/test/debuginfo/self-in-default-method.rs | 2 | ||||
| -rw-r--r-- | src/test/debuginfo/self-in-generic-default-method.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/test/debuginfo/issue7712.rs b/src/test/debuginfo/issue7712.rs index 948048ec272..94458a7fb4b 100644 --- a/src/test/debuginfo/issue7712.rs +++ b/src/test/debuginfo/issue7712.rs @@ -11,7 +11,7 @@ // compile-flags:--debuginfo=1 // min-lldb-version: 310 -pub trait TraitWithDefaultMethod { +pub trait TraitWithDefaultMethod : Sized { fn method(self) { () } diff --git a/src/test/debuginfo/self-in-default-method.rs b/src/test/debuginfo/self-in-default-method.rs index f8ef5b3d2fc..87884d2f956 100644 --- a/src/test/debuginfo/self-in-default-method.rs +++ b/src/test/debuginfo/self-in-default-method.rs @@ -118,7 +118,7 @@ struct Struct { x: int } -trait Trait { +trait Trait : Sized { fn self_by_ref(&self, arg1: int, arg2: int) -> int { zzz(); // #break arg1 + arg2 diff --git a/src/test/debuginfo/self-in-generic-default-method.rs b/src/test/debuginfo/self-in-generic-default-method.rs index c2594df7d35..62b5e6872ee 100644 --- a/src/test/debuginfo/self-in-generic-default-method.rs +++ b/src/test/debuginfo/self-in-generic-default-method.rs @@ -118,7 +118,7 @@ struct Struct { x: int } -trait Trait { +trait Trait : Sized { fn self_by_ref<T>(&self, arg1: int, arg2: T) -> int { zzz(); // #break |