diff options
| author | bors <bors@rust-lang.org> | 2017-11-24 12:38:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-11-24 12:38:11 +0000 |
| commit | 71da1c21ebc79f19e749344c8b4e2c13f533872e (patch) | |
| tree | dc135ce6161978161d4c7003b8bca5f3a84b8269 /src/rustllvm/RustWrapper.cpp | |
| parent | 85d50ce1c72dc577fad26a81acea390c60bb48c2 (diff) | |
| parent | 8937d6a6cfb011d9e1fe6b4a426913dbbf9fd584 (diff) | |
| download | rust-71da1c21ebc79f19e749344c8b4e2c13f533872e.tar.gz rust-71da1c21ebc79f19e749344c8b4e2c13f533872e.zip | |
Auto merge of #46116 - oli-obk:json_ui, r=nikomatsakis
Check //~ERROR comments in ui tests r? @nikomatsakis cc #44844 @Phlosioneer @estebank @petrochenkov this depends on https://github.com/rust-lang/rust/pull/46052 getting merged first (the commits are included in here) The relevant changes of this PR are c2f0af7 and 979269b
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions