From 5eb1cf16197a8cc38d18e81338f4c148e14ee36f Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Mon, 4 Nov 2019 11:57:17 +0300 Subject: [PATCH] rustc_metadata: Rename `schema` to `rmeta` And change `rmeta.rs` to `rmeta/mod.rs` --- src/librustc_metadata/creader.rs | 2 +- src/librustc_metadata/cstore.rs | 8 ++++---- src/librustc_metadata/lib.rs | 2 +- src/librustc_metadata/locator.rs | 2 +- src/librustc_metadata/{schema => rmeta}/decoder.rs | 4 ++-- .../{schema => rmeta}/decoder/cstore_impl.rs | 4 ++-- src/librustc_metadata/{schema => rmeta}/encoder.rs | 4 ++-- src/librustc_metadata/{schema.rs => rmeta/mod.rs} | 0 src/librustc_metadata/{schema => rmeta}/table.rs | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) rename src/librustc_metadata/{schema => rmeta}/decoder.rs (99%) rename src/librustc_metadata/{schema => rmeta}/decoder/cstore_impl.rs (99%) rename src/librustc_metadata/{schema => rmeta}/encoder.rs (99%) rename src/librustc_metadata/{schema.rs => rmeta/mod.rs} (100%) rename src/librustc_metadata/{schema => rmeta}/table.rs (99%) diff --git a/src/librustc_metadata/creader.rs b/src/librustc_metadata/creader.rs index 483b1a40e44d6..05e3ee3322e59 100644 --- a/src/librustc_metadata/creader.rs +++ b/src/librustc_metadata/creader.rs @@ -2,7 +2,7 @@ use crate::cstore::{self, CStore, MetadataBlob}; use crate::locator::{self, CratePaths}; -use crate::schema::{CrateRoot, CrateDep}; +use crate::rmeta::{CrateRoot, CrateDep}; use rustc_data_structures::sync::{Lock, Once, AtomicCell}; use rustc::hir::def_id::CrateNum; diff --git a/src/librustc_metadata/cstore.rs b/src/librustc_metadata/cstore.rs index 656ece79add92..c6c8ee575a98a 100644 --- a/src/librustc_metadata/cstore.rs +++ b/src/librustc_metadata/cstore.rs @@ -1,7 +1,7 @@ // The crate store - a central repo for information collected about external // crates and libraries -use crate::schema; +use crate::rmeta; use rustc::dep_graph::DepNodeIndex; use rustc::hir::def_id::{CrateNum, DefIndex}; use rustc::hir::map::definitions::DefPathTable; @@ -17,7 +17,7 @@ use syntax_expand::base::SyntaxExtension; use syntax_pos; use proc_macro::bridge::client::ProcMacro; -pub use crate::schema::{provide, provide_extern}; +pub use crate::rmeta::{provide, provide_extern}; // A map from external crate numbers (as decoded from some crate file) to // local crate numbers (as generated during this session). Each external @@ -49,7 +49,7 @@ crate struct CrateMetadata { /// lifetime is only used behind `Lazy`, and therefore acts like an /// universal (`for<'tcx>`), that is paired up with whichever `TyCtxt` /// is being used to decode those values. - crate root: schema::CrateRoot<'static>, + crate root: rmeta::CrateRoot<'static>, /// For each definition in this crate, we encode a key. When the /// crate is loaded, we read all the keys and put them in this /// hashmap, which gives the reverse mapping. This allows us to @@ -59,7 +59,7 @@ crate struct CrateMetadata { /// Trait impl data. /// FIXME: Used only from queries and can use query cache, /// so pre-decoding can probably be avoided. - crate trait_impls: FxHashMap<(u32, DefIndex), schema::Lazy<[DefIndex]>>, + crate trait_impls: FxHashMap<(u32, DefIndex), rmeta::Lazy<[DefIndex]>>, /// Proc macro descriptions for this crate, if it's a proc macro crate. crate raw_proc_macros: Option<&'static [ProcMacro]>, /// Source maps for code from the crate. diff --git a/src/librustc_metadata/lib.rs b/src/librustc_metadata/lib.rs index 516f9feb94573..ac9d78e9a515c 100644 --- a/src/librustc_metadata/lib.rs +++ b/src/librustc_metadata/lib.rs @@ -30,7 +30,7 @@ mod dependency_format; mod foreign_modules; mod link_args; mod native_libs; -mod schema; +mod rmeta; pub mod creader; pub mod cstore; diff --git a/src/librustc_metadata/locator.rs b/src/librustc_metadata/locator.rs index 4a263250f9b0d..88d7595b063da 100644 --- a/src/librustc_metadata/locator.rs +++ b/src/librustc_metadata/locator.rs @@ -214,7 +214,7 @@ use crate::cstore::MetadataBlob; use crate::creader::Library; -use crate::schema::{METADATA_HEADER, rustc_version}; +use crate::rmeta::{METADATA_HEADER, rustc_version}; use rustc_data_structures::fx::FxHashSet; use rustc_data_structures::svh::Svh; diff --git a/src/librustc_metadata/schema/decoder.rs b/src/librustc_metadata/rmeta/decoder.rs similarity index 99% rename from src/librustc_metadata/schema/decoder.rs rename to src/librustc_metadata/rmeta/decoder.rs index 0d113cecff561..40ec04537b0e6 100644 --- a/src/librustc_metadata/schema/decoder.rs +++ b/src/librustc_metadata/rmeta/decoder.rs @@ -1,8 +1,8 @@ // Decoding metadata from a single crate's metadata use crate::cstore::{self, CrateMetadata, MetadataBlob}; -use crate::schema::*; -use crate::schema::table::{FixedSizeEncoding, PerDefTable}; +use crate::rmeta::*; +use crate::rmeta::table::{FixedSizeEncoding, PerDefTable}; use rustc_index::vec::IndexVec; use rustc_data_structures::sync::Lrc; diff --git a/src/librustc_metadata/schema/decoder/cstore_impl.rs b/src/librustc_metadata/rmeta/decoder/cstore_impl.rs similarity index 99% rename from src/librustc_metadata/schema/decoder/cstore_impl.rs rename to src/librustc_metadata/rmeta/decoder/cstore_impl.rs index 59aa5c7402ffb..6eacfc28de2db 100644 --- a/src/librustc_metadata/schema/decoder/cstore_impl.rs +++ b/src/librustc_metadata/rmeta/decoder/cstore_impl.rs @@ -2,7 +2,7 @@ use crate::cstore::{self, LoadedMacro}; use crate::link_args; use crate::native_libs; use crate::foreign_modules; -use crate::schema::{self, encoder}; +use crate::rmeta::{self, encoder}; use rustc::ty::query::QueryConfig; use rustc::middle::cstore::{CrateSource, CrateStore, DepKind, EncodedMetadata, NativeLibraryKind}; @@ -528,6 +528,6 @@ impl CrateStore for cstore::CStore { fn metadata_encoding_version(&self) -> &[u8] { - schema::METADATA_HEADER + rmeta::METADATA_HEADER } } diff --git a/src/librustc_metadata/schema/encoder.rs b/src/librustc_metadata/rmeta/encoder.rs similarity index 99% rename from src/librustc_metadata/schema/encoder.rs rename to src/librustc_metadata/rmeta/encoder.rs index 9970d753dbca8..afc81649e3719 100644 --- a/src/librustc_metadata/schema/encoder.rs +++ b/src/librustc_metadata/rmeta/encoder.rs @@ -1,5 +1,5 @@ -use crate::schema::*; -use crate::schema::table::{FixedSizeEncoding, PerDefTable}; +use crate::rmeta::*; +use crate::rmeta::table::{FixedSizeEncoding, PerDefTable}; use rustc::middle::cstore::{LinkagePreference, NativeLibrary, EncodedMetadata, ForeignModule}; diff --git a/src/librustc_metadata/schema.rs b/src/librustc_metadata/rmeta/mod.rs similarity index 100% rename from src/librustc_metadata/schema.rs rename to src/librustc_metadata/rmeta/mod.rs diff --git a/src/librustc_metadata/schema/table.rs b/src/librustc_metadata/rmeta/table.rs similarity index 99% rename from src/librustc_metadata/schema/table.rs rename to src/librustc_metadata/rmeta/table.rs index cc65ab8a8ff55..613d92c6d7b0b 100644 --- a/src/librustc_metadata/schema/table.rs +++ b/src/librustc_metadata/rmeta/table.rs @@ -1,4 +1,4 @@ -use crate::schema::*; +use crate::rmeta::*; use rustc::hir::def_id::{DefId, DefIndex}; use rustc_serialize::{Encodable, opaque::Encoder};