Wire target edition to rustc/rustdoc

Author: dwijnand

src/cargo/core/compiler/compilation.rs

@@ -121,22 +121,22 @@ impl<'cfg> Compilation<'cfg> {
     }
 
     /// See `process`.
-    pub fn rustc_process(&self, pkg: &Package) -> CargoResult<ProcessBuilder> {
+    pub fn rustc_process(&self, pkg: &Package, target: &Target) -> CargoResult<ProcessBuilder> {
         let mut p = self.fill_env(self.rustc_process.clone(), pkg, true)?;
         let manifest = pkg.manifest();
         if manifest.features().is_enabled(Feature::edition()) {
-            p.arg(format!("--edition={}", manifest.edition()));
+            p.arg(format!("--edition={}", target.edition()));
         }
         Ok(p)
     }
 
     /// See `process`.
-    pub fn rustdoc_process(&self, pkg: &Package) -> CargoResult<ProcessBuilder> {
+    pub fn rustdoc_process(&self, pkg: &Package, target: &Target) -> CargoResult<ProcessBuilder> {
         let mut p = self.fill_env(process(&*self.config.rustdoc()?), pkg, false)?;
         let manifest = pkg.manifest();
         if manifest.features().is_enabled(Feature::edition()) {
             p.arg("-Zunstable-options");
-            p.arg(format!("--edition={}", &manifest.edition()));
+            p.arg(format!("--edition={}", target.edition()));
         }
         Ok(p)
     }

src/cargo/core/compiler/mod.rs

@@ -554,7 +554,7 @@ fn prepare_rustc<'a, 'cfg>(
     crate_types: &[&str],
     unit: &Unit<'a>,
 ) -> CargoResult<ProcessBuilder> {
-    let mut base = cx.compilation.rustc_process(unit.pkg)?;
+    let mut base = cx.compilation.rustc_process(unit.pkg, unit.target)?;
     base.inherit_jobserver(&cx.jobserver);
     build_base_args(cx, &mut base, unit, crate_types)?;
     build_deps_args(&mut base, cx, unit)?;
@@ -563,7 +563,7 @@ fn prepare_rustc<'a, 'cfg>(
 
 fn rustdoc<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoResult<Work> {
     let bcx = cx.bcx;
-    let mut rustdoc = cx.compilation.rustdoc_process(unit.pkg)?;
+    let mut rustdoc = cx.compilation.rustdoc_process(unit.pkg, unit.target)?;
     rustdoc.inherit_jobserver(&cx.jobserver);
     rustdoc.arg("--crate-name").arg(&unit.target.crate_name());
     add_path_args(bcx, unit, &mut rustdoc);

src/cargo/ops/cargo_test.rs

@@ -161,7 +161,7 @@ fn run_doc_tests(
             deps,
         } = doctest_info;
         config.shell().status("Doc-tests", target.name())?;
-        let mut p = compilation.rustdoc_process(package)?;
+        let mut p = compilation.rustdoc_process(package, target)?;
         p.arg("--test")
             .arg(target.src_path())
             .arg("--crate-name")