From 754455e4f25bb55dfafc6422f340d6032d3ac0b7 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Wed, 3 Nov 2021 20:00:00 -0700
Subject: Clean up some `-Z unstable-options` in tests.

---
 src/tools/compiletest/src/header.rs  | 3 ---
 src/tools/compiletest/src/runtest.rs | 3 ---
 2 files changed, 6 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
index 98d1ee19f69..5fcaa452ca3 100644
--- a/src/tools/compiletest/src/header.rs
+++ b/src/tools/compiletest/src/header.rs
@@ -242,9 +242,6 @@ impl TestProps {
                 if let Some(edition) = config.parse_edition(ln) {
                     self.compile_flags.push(format!("--edition={}", edition));
                     has_edition = true;
-                    if edition == "2021" {
-                        self.compile_flags.push("-Zunstable-options".to_string());
-                    }
                 }
 
                 config.parse_and_update_revisions(ln, &mut self.revisions);
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 4470272a9f8..3c85b9076dd 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -1607,9 +1607,6 @@ impl<'test> TestCx<'test> {
                 get_lib_name(&aux_path.trim_end_matches(".rs").replace('-', "_"), is_dylib);
             rustc.arg("--extern").arg(format!("{}={}/{}", aux_name, aux_dir.display(), lib_name));
         }
-        if !self.props.aux_crates.is_empty() {
-            rustc.arg("-Zunstable-options");
-        }
 
         aux_dir
     }
-- 
cgit 1.4.1-3-g733a5