]> git.lizzy.rs Git - rust.git/commitdiff
projects / rust.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e504d3 472b04d)
Auto merge of #51094 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
authorbors <bors@rust-lang.org>
Sat, 26 May 2018 19:05:39 +0000 (19:05 +0000)
committerbors <bors@rust-lang.org>
Sat, 26 May 2018 19:05:39 +0000 (19:05 +0000)
Rollup of 3 pull requests

Successful merges:

 - #51049 (Fix behaviour of divergence in while loop conditions)
 - #51057 (make ui tests robust with respect to NLL)
 - #51092 ([master] Release notes for 1.26.1)

Failed merges:

1  2 
src/librustc_typeck/check/mod.rs patch | diff1 | diff2 | blob | history

diff --cc src/librustc_typeck/check/mod.rs
Simple merge
Empowering everyone to build reliable and efficient software.