From 4c8105e8b743ce1742a91a07dca3b5a23f72178b Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Sun, 24 Nov 2019 01:25:22 +0300
Subject: [PATCH] rustc_metadata: Privatize some fields and methods of `CStore`

After it's moved to `creader.rs`
---
 src/librustc_metadata/creader.rs               | 18 +++++++++++++-----
 .../rmeta/decoder/cstore_impl.rs               |  4 ++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/librustc_metadata/creader.rs b/src/librustc_metadata/creader.rs
index 342e6ff52f8..5753afc5fcb 100644
--- a/src/librustc_metadata/creader.rs
+++ b/src/librustc_metadata/creader.rs
@@ -36,8 +36,8 @@ use rustc_error_codes::*;
 #[derive(Clone)]
 pub struct CStore {
     metas: IndexVec<CrateNum, Option<Lrc<CrateMetadata>>>,
-    crate injected_panic_runtime: Option<CrateNum>,
-    crate allocator_kind: Option<AllocatorKind>,
+    injected_panic_runtime: Option<CrateNum>,
+    allocator_kind: Option<AllocatorKind>,
 }
 
 pub struct CrateLoader<'a> {
@@ -91,7 +91,7 @@ fn dump_crates(cstore: &CStore) {
 }
 
 impl CStore {
-    crate fn alloc_new_crate_num(&mut self) -> CrateNum {
+    fn alloc_new_crate_num(&mut self) -> CrateNum {
         self.metas.push(None);
         CrateNum::new(self.metas.len() - 1)
     }
@@ -101,7 +101,7 @@ impl CStore {
             .unwrap_or_else(|| panic!("Failed to get crate data for {:?}", cnum))
     }
 
-    crate fn set_crate_data(&mut self, cnum: CrateNum, data: CrateMetadata) {
+    fn set_crate_data(&mut self, cnum: CrateNum, data: CrateMetadata) {
         assert!(self.metas[cnum].is_none(), "Overwriting crate metadata entry");
         self.metas[cnum] = Some(Lrc::new(data));
     }
@@ -137,11 +137,19 @@ impl CStore {
         deps
     }
 
-    crate fn crate_dependencies_in_reverse_postorder(&self, cnum: CrateNum) -> Vec<CrateNum> {
+    fn crate_dependencies_in_reverse_postorder(&self, cnum: CrateNum) -> Vec<CrateNum> {
         let mut deps = self.crate_dependencies_in_postorder(cnum);
         deps.reverse();
         deps
     }
+
+    crate fn injected_panic_runtime(&self) -> Option<CrateNum> {
+        self.injected_panic_runtime
+    }
+
+    crate fn allocator_kind(&self) -> Option<AllocatorKind> {
+        self.allocator_kind
+    }
 }
 
 impl<'a> CrateLoader<'a> {
diff --git a/src/librustc_metadata/rmeta/decoder/cstore_impl.rs b/src/librustc_metadata/rmeta/decoder/cstore_impl.rs
index eb5e3115dd2..2271802b812 100644
--- a/src/librustc_metadata/rmeta/decoder/cstore_impl.rs
+++ b/src/librustc_metadata/rmeta/decoder/cstore_impl.rs
@@ -530,10 +530,10 @@ impl CrateStore for CStore {
     }
 
     fn injected_panic_runtime(&self) -> Option<CrateNum> {
-        self.injected_panic_runtime
+        self.injected_panic_runtime()
     }
 
     fn allocator_kind(&self) -> Option<AllocatorKind> {
-        self.allocator_kind
+        self.allocator_kind()
     }
 }