]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #60928 - TheSirC:fix/60229, r=eddyb
authorMazdak Farrokhzad <twingoow@gmail.com>
Tue, 28 May 2019 22:19:55 +0000 (00:19 +0200)
committerGitHub <noreply@github.com>
Tue, 28 May 2019 22:19:55 +0000 (00:19 +0200)
Changes the type `mir::Mir` into `mir::Body`

Fixes part 1 of #60229 (previously attempted in #60242).

I stumbled upon the issue and it seems that the previous attempt at solving it was not merged. This is a second try more up-to-date.

The commit should have changed comments as well.
At the time of writting, it passes the tidy and check tool.

1  2 
src/librustc/mir/interpret/mod.rs
src/librustc/mir/mod.rs
src/librustc/ty/context.rs
src/librustc_mir/borrow_check/nll/type_check/mod.rs
src/librustc_mir/const_eval.rs
src/librustc_mir/transform/const_prop.rs

Simple merge
Simple merge
Simple merge
Simple merge