Auto merge of rust-lang#6063 - joelgallant:rustdoc-edition-master, r=…

…alexcrichton Removes -Zunstable-options for rustdoc testing See rust-lang#6062 - this is for master
alexcrichton · Sep 20, 2018 · b1e1d38 · b1e1d38
2 parents 0e3c5f2 + 2e9ea1e
commit b1e1d38
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/cargo/core/compiler/compilation.rs b/src/cargo/core/compiler/compilation.rs
@@ -140,7 +140,6 @@ impl<'cfg> Compilation<'cfg> {
     pub fn rustdoc_process(&self, pkg: &Package, target: &Target) -> CargoResult<ProcessBuilder> {
         let mut p = self.fill_env(process(&*self.config.rustdoc()?), pkg, false)?;
         if target.edition() != Edition::Edition2015 {
-            p.arg("-Zunstable-options");
             p.arg(format!("--edition={}", target.edition()));
         }
         Ok(p)

diff --git a/tests/testsuite/doc.rs b/tests/testsuite/doc.rs
@@ -1118,12 +1118,12 @@ fn doc_edition() {
 
     p.cargo("doc -v")
         .masquerade_as_nightly_cargo()
-        .with_stderr_contains("[RUNNING] `rustdoc [..]-Zunstable-options --edition=2018[..]")
+        .with_stderr_contains("[RUNNING] `rustdoc [..]--edition=2018[..]")
         .run();
 
     p.cargo("test -v")
         .masquerade_as_nightly_cargo()
-        .with_stderr_contains("[RUNNING] `rustdoc [..]-Zunstable-options --edition=2018[..]")
+        .with_stderr_contains("[RUNNING] `rustdoc [..]--edition=2018[..]")
         .run();
 }
 
@@ -1150,12 +1150,12 @@ fn doc_target_edition() {
 
     p.cargo("doc -v")
         .masquerade_as_nightly_cargo()
-        .with_stderr_contains("[RUNNING] `rustdoc [..]-Zunstable-options --edition=2018[..]")
+        .with_stderr_contains("[RUNNING] `rustdoc [..]--edition=2018[..]")
         .run();
 
     p.cargo("test -v")
         .masquerade_as_nightly_cargo()
-        .with_stderr_contains("[RUNNING] `rustdoc [..]-Zunstable-options --edition=2018[..]")
+        .with_stderr_contains("[RUNNING] `rustdoc [..]--edition=2018[..]")
         .run();
 }