itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #6448 - dwijnand:upgrade-the-metabuild-to-rust-2018, r=ehuss

Browse Source 
Upgrade the metabuild to Rust 2018

Just happened across the code that @ehuss mentioned in https://github.com/rust-lang/cargo/pull/6423#issuecomment-446807216 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.
This commit is contained in:
bors 2018-12-17 15:42:58 +00:00
commit db0bb7f7cd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cargo/core/compiler/custom_build.rs
View File

@ -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 {

2
src/cargo/core/manifest.rs
View File

@ -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)
}
}