Skip to content

Commit

Permalink
Auto merge of #6448 - dwijnand:upgrade-the-metabuild-to-rust-2018, r=…
Browse files Browse the repository at this point in the history
…ehuss

Upgrade the metabuild to Rust 2018

Just happened across the code that @ehuss mentioned in #6423 (comment) and thought of reviving that effort.

@ehuss says there's no reason to.  Let's see if it passes CI and we should land this change or not.
  • Loading branch information
bors committed Dec 17, 2018
2 parents b15d11a + e881e3b commit db0bb7f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/custom_build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ fn prepare_metabuild<'a, 'cfg>(
})
.collect();
for dep in &meta_deps {
output.push(format!("extern crate {};\n", dep));
output.push(format!("use {};\n", dep));
}
output.push("fn main() {\n".to_string());
for dep in &meta_deps {
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/core/manifest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ impl Target {
for_host: true,
benched: false,
tested: false,
..Target::new(TargetSourcePath::Metabuild, Edition::Edition2015)
..Target::new(TargetSourcePath::Metabuild, Edition::Edition2018)
}
}

Expand Down

0 comments on commit db0bb7f

Please sign in to comment.