From 698d6d0badad9aa2a12b033a33d28c19ffaec79c Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@neon.tech>
Date: Mon, 12 Sep 2022 00:07:34 +0300
Subject: [PATCH] Use stable coverage API with rustc 1.60

---
 scripts/coverage | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/scripts/coverage b/scripts/coverage
index af0d067419..1dc92e57cc 100755
--- a/scripts/coverage
+++ b/scripts/coverage
@@ -75,8 +75,6 @@ class Cargo:
     def rustlib_dir(self) -> Path:
         if not self._rustlib_dir:
             cmd = [
-                'cargo',
-                '-Zunstable-options',
                 'rustc',
                 '--print=target-libdir',
             ]
@@ -397,7 +395,7 @@ class State:
             # Enable LLVM's source-based coverage
             # see: https://clang.llvm.org/docs/SourceBasedCodeCoverage.html
             # see: https://blog.rust-lang.org/inside-rust/2020/11/12/source-based-code-coverage.html
-            '-Zinstrument-coverage',
+            '-Cinstrument-coverage',
             # Link every bit of code to prevent "holes" in coverage report
             # see: https://doc.rust-lang.org/rustc/codegen-options/index.html#link-dead-code
             '-Clink-dead-code',
@@ -410,10 +408,6 @@ class State:
             f'--remap-path-prefix {self.cwd}=',
         ])
 
-        # XXX: God, have mercy on our souls...
-        # see: https://github.com/rust-lang/rust/pull/90132
-        os.environ['RUSTC_BOOTSTRAP'] = '1'
-
     def _merge_profraw(self) -> bool:
         profdata_path = self.profdata_dir / '-'.join([
             self.profraw_prefix,