Skip to content

Commit db0bb7f

Browse files
committed
Auto merge of #6448 - dwijnand:upgrade-the-metabuild-to-rust-2018, r=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.
2 parents b15d11a + e881e3b commit db0bb7f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/cargo/core/compiler/custom_build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ fn prepare_metabuild<'a, 'cfg>(
571571
})
572572
.collect();
573573
for dep in &meta_deps {
574-
output.push(format!("extern crate {};\n", dep));
574+
output.push(format!("use {};\n", dep));
575575
}
576576
output.push("fn main() {\n".to_string());
577577
for dep in &meta_deps {

src/cargo/core/manifest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ impl Target {
638638
for_host: true,
639639
benched: false,
640640
tested: false,
641-
..Target::new(TargetSourcePath::Metabuild, Edition::Edition2015)
641+
..Target::new(TargetSourcePath::Metabuild, Edition::Edition2018)
642642
}
643643
}
644644

0 commit comments

Comments
 (0)