]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #52568 - oli-obk:span_bug_error, r=varkor
authorbors <bors@rust-lang.org>
Mon, 23 Jul 2018 01:02:32 +0000 (01:02 +0000)
committerbors <bors@rust-lang.org>
Mon, 23 Jul 2018 01:02:32 +0000 (01:02 +0000)
Fix loop label resolution around constants

And make `delay_span_bug` a little more helpful

r? @varkor

fixes #52442
fixes #52443

1  2 
src/librustc/hir/lowering.rs
src/librustc_resolve/lib.rs
src/librustc_typeck/check/mod.rs
src/librustdoc/core.rs

Simple merge
Simple merge
Simple merge
Simple merge