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/rustllvm/RustWrapper.cpp | |
| 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/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions