rustc_metadata: Move decoder/encoder/table into mod schema

Author: petrochenkov

src/librustc_metadata/cstore_impl.rs

@@ -1,5 +1,4 @@
 use crate::cstore::{self, LoadedMacro};
-use crate::encoder;
 use crate::link_args;
 use crate::native_libs;
 use crate::foreign_modules;
@@ -524,7 +523,7 @@ impl CrateStore for cstore::CStore {
     }
 
     fn encode_metadata(&self, tcx: TyCtxt<'_>) -> EncodedMetadata {
-        encoder::encode_metadata(tcx)
+        schema::encode_metadata(tcx)
     }
 
     fn metadata_encoding_version(&self) -> &[u8]

src/librustc_metadata/lib.rs

@@ -26,15 +26,12 @@ extern crate rustc_data_structures;
 
 pub mod error_codes;
 
-mod encoder;
-mod decoder;
 mod dependency_format;
 mod cstore_impl;
 mod foreign_modules;
 mod link_args;
 mod native_libs;
 mod schema;
-mod table;
 
 pub mod creader;
 pub mod cstore;

src/librustc_metadata/schema.rs

@@ -1,4 +1,4 @@
-use crate::table::PerDefTable;
+use table::PerDefTable;
 
 use rustc::hir;
 use rustc::hir::def::{self, CtorKind};
@@ -13,7 +13,6 @@ use rustc::ty::{self, Ty, ReprOptions};
 use rustc_target::spec::{PanicStrategy, TargetTriple};
 use rustc_index::vec::IndexVec;
 use rustc_data_structures::svh::Svh;
-
 use rustc_serialize::Encodable;
 use syntax::{ast, attr};
 use syntax::edition::Edition;
@@ -23,6 +22,13 @@ use syntax_pos::{self, Span};
 use std::marker::PhantomData;
 use std::num::NonZeroUsize;
 
+crate use decoder::Metadata;
+crate use encoder::encode_metadata;
+
+mod decoder;
+mod encoder;
+mod table;
+
 crate fn rustc_version() -> String {
     format!("rustc {}",
             option_env!("CFG_VERSION").unwrap_or("unknown version"))

src/librustc_metadata/decoder.rs renamed to src/librustc_metadata/schema/decoder.rs

@@ -2,7 +2,7 @@
 
 use crate::cstore::{self, CrateMetadata, MetadataBlob};
 use crate::schema::*;
-use crate::table::{FixedSizeEncoding, PerDefTable};
+use crate::schema::table::{FixedSizeEncoding, PerDefTable};
 
 use rustc_index::vec::IndexVec;
 use rustc_data_structures::sync::Lrc;
@@ -1358,7 +1358,7 @@ impl<'a, 'tcx> CrateMetadata {
 
     /// Get the `DepNodeIndex` corresponding this crate. The result of this
     /// method is cached in the `dep_node_index` field.
-    pub(super) fn get_crate_dep_node_index(&self, tcx: TyCtxt<'tcx>) -> DepNodeIndex {
+    crate fn get_crate_dep_node_index(&self, tcx: TyCtxt<'tcx>) -> DepNodeIndex {
         let mut dep_node_index = self.dep_node_index.load();
 
         if unlikely!(dep_node_index == DepNodeIndex::INVALID) {

src/librustc_metadata/encoder.rs renamed to src/librustc_metadata/schema/encoder.rs

@@ -1,5 +1,5 @@
 use crate::schema::*;
-use crate::table::{FixedSizeEncoding, PerDefTable};
+use crate::schema::table::{FixedSizeEncoding, PerDefTable};
 
 use rustc::middle::cstore::{LinkagePreference, NativeLibrary,
                             EncodedMetadata, ForeignModule};

src/librustc_metadata/table.rs renamed to src/librustc_metadata/schema/table.rs

@@ -1,4 +1,3 @@
-use crate::decoder::Metadata;
 use crate::schema::*;
 
 use rustc::hir::def_id::{DefId, DefIndex};