Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

librustc_mir => 2018 #58265

Merged
merged 4 commits into from
Feb 9, 2019
Merged

librustc_mir => 2018 #58265

merged 4 commits into from
Feb 9, 2019

Conversation

taiki-e
Copy link
Member

@taiki-e taiki-e commented Feb 7, 2019 •
edited
Loading

Transitions librustc_mir to Rust 2018; cc #58099

TODO: elided_lifetimes_in_paths

r? @Centril

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 7, 2019
@matthewjasper
Copy link
Contributor

r? @matthewjasper

@taiki-e taiki-e changed the title [WIP] librustc_mir => 2018 librustc_mir => 2018 Feb 7, 2019
scottmcm
scottmcm reviewed Feb 8, 2019
View reviewed changes
src/librustc_mir/lib.rs Outdated Show resolved Hide resolved
matthewjasper
matthewjasper requested changes Feb 8, 2019
View reviewed changes
Copy link
Contributor

@matthewjasper matthewjasper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One nit and then I think that this is good to go.

src/librustc_mir/lib.rs Outdated Show resolved Hide resolved
scottmcm
scottmcm reviewed Feb 8, 2019
View reviewed changes
src/librustc_mir/borrow_check/nll/mod.rs
@@ -254,14 +254,14 @@ fn dump_mir_results<'a, 'gcx, 'tcx>(
);

// Also dump the inference graph constraints as a graphviz file.
let _: io::Result<()> = try_block! {
let _: io::Result<()> = try {
let mut file =
pretty::create_dump_file(infcx.tcx, "regioncx.all.dot", None, "nll", &0, source)?;
regioncx.dump_graphviz_raw_constraints(&mut file)?;
};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

taiki-e
taiki-e commented Feb 8, 2019
View reviewed changes
src/librustc_mir/transform/qualify_consts.rs
use super::promote_consts::{self, Candidate, TempState};

bitflags! {
bitflags::bitflags! {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bitflags! is only used here.

@matthewjasper
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Feb 8, 2019

📌 Commit c9bc85e has been approved by matthewjasper

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 8, 2019
Centril added a commit to Centril/rust that referenced this pull request Feb 8, 2019
@Centril
Rollup merge of rust-lang#58265 - taiki-e:librustc_mir-2018, r=matthe…
c3b4102 
…wjasper

librustc_mir => 2018

Transitions `librustc_mir` to Rust 2018; cc rust-lang#58099

TODO: ~~elided_lifetimes_in_paths~~

r? @Centril
@Centril Centril mentioned this pull request Feb 8, 2019
Merged
bors added a commit that referenced this pull request Feb 9, 2019
@bors
Auto merge of #58316 - Centril:rollup, r=Centril
cb6fafb 
Rollup of 18 pull requests

Successful merges:

 - #58091 (Transition compiletest to Rust 2018)
 - #58115 (Transition rustdoc to 2018 edition)
 - #58120 (Transition build_helper to 2018 edition)
 - #58222 (librustc_allocator => 2018)
 - #58233 (librustc_save_analysis => 2018)
 - #58245 (librustc_lint => 2018)
 - #58247 (librustc_passes => 2018)
 - #58251 (Transition librustc_traits to 2018 edition)
 - #58255 (librustc_metadata => 2018)
 - #58256 (librustc_cratesio_shim => 2018)
 - #58257 (librustc_target => 2018)
 - #58259 (librustc_codegen_utils => 2018)
 - #58260 (librustc_borrowck => 2018)
 - #58261 (librustc_incremental => 2018)
 - #58265 (librustc_mir => 2018)
 - #58275 (libcore, liballoc: disable tests in Miri)
 - #58285 (error_index_generator => 2018)
 - #58312 (librustc_data_structures => 2018)

Failed merges:

r? @ghost
@bors bors merged commit c9bc85e into rust-lang:master Feb 9, 2019
@taiki-e taiki-e deleted the librustc_mir-2018 branch February 9, 2019 03:57
@taiki-e taiki-e mentioned this pull request Feb 10, 2019
Merged
@Centril Centril mentioned this pull request Feb 11, 2019
Closed
78 tasks
Centril added a commit to Centril/rust that referenced this pull request Feb 12, 2019
@Centril
Rollup merge of rust-lang#58342 - taiki-e:nll, r=matthewjasper
f04d085 
Revert removed #![feature(nll)]

In PRs related to rust-lang#58099, `#![feature(nll)]` was removed from several crates.
This PR reverts it.

Related: rust-lang#58265 (comment)

cc @Centril

r? @matthewjasper
spikespaz pushed a commit to spikespaz/dotwalk-rs that referenced this pull request Aug 29, 2024
@Centril
Rollup merge of #58342 - taiki-e:nll, r=matthewjasper
ce64490 
Revert removed #![feature(nll)]

In PRs related to #58099, `#![feature(nll)]` was removed from several crates.
This PR reverts it.

Related: rust-lang/rust#58265 (comment)

cc @Centril

r? @matthewjasper
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@scottmcm scottmcm scottmcm left review comments

@matthewjasper matthewjasper matthewjasper approved these changes

Assignees

@matthewjasper matthewjasper

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@taiki-e @matthewjasper @bors @scottmcm @Centril @rust-highfive