]> git.lizzy.rs Git - rust.git/commit
projects / rust.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 85d50ce 8937d6a)
Auto merge of #46116 - oli-obk:json_ui, r=nikomatsakis
authorbors <bors@rust-lang.org>
Fri, 24 Nov 2017 12:38:11 +0000 (12:38 +0000)
committerbors <bors@rust-lang.org>
Fri, 24 Nov 2017 12:38:11 +0000 (12:38 +0000)
commit71da1c21ebc79f19e749344c8b4e2c13f533872e
treedc135ce6161978161d4c7003b8bca5f3a84b8269tree | snapshot
parent85d50ce1c72dc577fad26a81acea390c60bb48c2commit | diff
parent8937d6a6cfb011d9e1fe6b4a426913dbbf9fd584commit | diff
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
Empowering everyone to build reliable and efficient software.