]> git.lizzy.rs Git - rust.git/commitdiff
projects / rust.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01a8b5f 748dd45)
Auto merge of #69330 - Centril:literally-melting-ice, r=eddyb
authorbors <bors@rust-lang.org>
Fri, 21 Feb 2020 10:04:22 +0000 (10:04 +0000)
committerbors <bors@rust-lang.org>
Fri, 21 Feb 2020 10:04:22 +0000 (10:04 +0000)
`lit_to_const`: gracefully bubble up type errors.

Fixes https://github.com/rust-lang/rust/issues/69310 which was injected by https://github.com/rust-lang/rust/pull/68118.

r? @pnkfelix @varkor @eddyb
cc @skinny121

1  2 
src/librustc_mir_build/hair/cx/mod.rs patch | diff1 | diff2 | blob | history
src/librustc_typeck/astconv.rs patch | diff1 | diff2 | blob | history

diff --cc src/librustc_mir_build/hair/cx/mod.rs
Simple merge
diff --cc src/librustc_typeck/astconv.rs
Simple merge
Empowering everyone to build reliable and efficient software.