5 files changed, 6 insertions, 2 deletions
diff --git a/src/librustc_metadata/cstore.rs b/src/librustc_metadata/cstore.rs
index b7596d2018f..656ece79add 100644
--- a/src/librustc_metadata/cstore.rs
+++ b/src/librustc_metadata/cstore.rs
@@ -17,7 +17,7 @@ use syntax_expand::base::SyntaxExtension;
 use syntax_pos;
 use proc_macro::bridge::client::ProcMacro;
 
-pub use crate::cstore_impl::{provide, provide_extern};
+pub use crate::schema::{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
diff --git a/src/librustc_metadata/lib.rs b/src/librustc_metadata/lib.rs
index be7925f9f52..516f9feb945 100644
--- a/src/librustc_metadata/lib.rs
+++ b/src/librustc_metadata/lib.rs
@@ -27,7 +27,6 @@ extern crate rustc_data_structures;
 pub mod error_codes;
 
 mod dependency_format;
-mod cstore_impl;
 mod foreign_modules;
 mod link_args;
 mod native_libs;
diff --git a/src/librustc_metadata/schema.rs b/src/librustc_metadata/schema.rs
index dcee19be432..e7b56fed50a 100644
--- a/src/librustc_metadata/schema.rs
+++ b/src/librustc_metadata/schema.rs
@@ -23,6 +23,7 @@ use syntax_pos::{self, Span};
 use std::marker::PhantomData;
 use std::num::NonZeroUsize;
 
+pub use decoder::{provide, provide_extern};
 crate use encoder::encode_metadata;
 
 mod decoder;
diff --git a/src/librustc_metadata/schema/decoder.rs b/src/librustc_metadata/schema/decoder.rs
index 33a75e909c7..2264cd3804e 100644
--- a/src/librustc_metadata/schema/decoder.rs
+++ b/src/librustc_metadata/schema/decoder.rs
@@ -40,6 +40,10 @@ use syntax_pos::symbol::{Symbol, sym};
 use log::debug;
 use proc_macro::bridge::client::ProcMacro;
 
+pub use cstore_impl::{provide, provide_extern};
+
+mod cstore_impl;
+
 crate struct DecodeContext<'a, 'tcx> {
     opaque: opaque::Decoder<'a>,
     cdata: Option<&'a CrateMetadata>,
diff --git a/src/librustc_metadata/cstore_impl.rs b/src/librustc_metadata/schema/decoder/cstore_impl.rs
index 2d3a6f4fa9f..2d3a6f4fa9f 100644
--- a/src/librustc_metadata/cstore_impl.rs
+++ b/src/librustc_metadata/schema/decoder/cstore_impl.rs