From d8d6a5aee0b258d5727d647d3943a75e66924932 Mon Sep 17 00:00:00 2001
From: Camille Gillot <gillot.camille@gmail.com>
Date: Tue, 1 Jun 2021 09:05:22 +0200
Subject: [PATCH] Revert "Reduce the amount of untracked state in TyCtxt"

---
 src/allocator.rs | 2 +-
 src/lib.rs       | 1 -
 src/metadata.rs  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/allocator.rs b/src/allocator.rs
index d39486c2f10..357a9f2daf7 100644
--- a/src/allocator.rs
+++ b/src/allocator.rs
@@ -19,7 +19,7 @@ pub(crate) fn codegen(
     });
     if any_dynamic_crate {
         false
-    } else if let Some(kind) = tcx.allocator_kind(()) {
+    } else if let Some(kind) = tcx.allocator_kind() {
         codegen_inner(module, unwind_context, kind);
         true
     } else {
diff --git a/src/lib.rs b/src/lib.rs
index 637e91f5117..4ee887cd5af 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -14,7 +14,6 @@ extern crate rustc_fs_util;
 extern crate rustc_hir;
 extern crate rustc_incremental;
 extern crate rustc_index;
-extern crate rustc_metadata;
 extern crate rustc_session;
 extern crate rustc_span;
 extern crate rustc_target;
diff --git a/src/metadata.rs b/src/metadata.rs
index db24bf65eb5..ab238244d68 100644
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -10,7 +10,7 @@ pub(crate) fn write_metadata<O: WriteMetadata>(tcx: TyCtxt<'_>, object: &mut O)
     use std::io::Write;
 
     let metadata = tcx.encode_metadata();
-    let mut compressed = rustc_metadata::METADATA_HEADER.to_vec();
+    let mut compressed = tcx.metadata_encoding_version();
     FrameEncoder::new(&mut compressed).write_all(&metadata.raw_data).unwrap();
 
     object.add_rustc_section(