Add custom driver

[rust.git] / src / metadata.rs

diff --git a/src/metadata.rs b/src/metadata.rs
index 3c3a7c5014910527dc6c48efca990c0c415b594e..93cff5711d937ec4234ac44efb01bce1847ba33a 100644 (file)
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -1,18 +1,20 @@
+//! Reading and writing of the rustc metadata for rlibs and dylibs
+
 use std::convert::TryFrom;
 use std::fs::File;
 use std::path::Path;
 
-use rustc::middle::cstore::{EncodedMetadata, MetadataLoader};
-use rustc_session::config;
-use rustc::ty::TyCtxt;
 use rustc_codegen_ssa::METADATA_FILENAME;
 use rustc_data_structures::owning_ref::{self, OwningRef};
 use rustc_data_structures::rustc_erase_owner;
+use rustc_middle::middle::cstore::{EncodedMetadata, MetadataLoader};
+use rustc_middle::ty::TyCtxt;
+use rustc_session::config;
 use rustc_target::spec::Target;
 
 use crate::backend::WriteMetadata;
 
-pub struct CraneliftMetadataLoader;
+pub(crate) struct CraneliftMetadataLoader;
 
 impl MetadataLoader for CraneliftMetadataLoader {
     fn get_rlib_metadata(
@@ -27,7 +29,7 @@ fn get_rlib_metadata(
             if entry.header().identifier() == METADATA_FILENAME.as_bytes() {
                 let mut buf = Vec::with_capacity(
                     usize::try_from(entry.header().size())
-                        .expect("Rlib metadata file too big to load into memory.")
+                        .expect("Rlib metadata file too big to load into memory."),
                 );
                 ::std::io::copy(&mut entry, &mut buf).map_err(|e| format!("{:?}", e))?;
                 let buf: OwningRef<Vec<u8>, [u8]> = OwningRef::new(buf).into();
@@ -59,9 +61,11 @@ fn get_dylib_metadata(
 }
 
 // Adapted from https://github.com/rust-lang/rust/blob/da573206f87b5510de4b0ee1a9c044127e409bd3/src/librustc_codegen_llvm/base.rs#L47-L112
-pub fn write_metadata<P: WriteMetadata>(tcx: TyCtxt<'_>, product: &mut P) -> EncodedMetadata {
-    use flate2::write::DeflateEncoder;
-    use flate2::Compression;
+pub(crate) fn write_metadata<P: WriteMetadata>(
+    tcx: TyCtxt<'_>,
+    product: &mut P,
+) -> EncodedMetadata {
+    use snap::write::FrameEncoder;
     use std::io::Write;
 
     #[derive(PartialEq, Eq, PartialOrd, Ord)]
@@ -73,8 +77,7 @@ enum MetadataKind {
 
     let kind = tcx
         .sess
-        .crate_types
-        .borrow()
+        .crate_types()
         .iter()
         .map(|ty| match *ty {
             config::CrateType::Executable
@@ -99,12 +102,12 @@ enum MetadataKind {
 
     assert!(kind == MetadataKind::Compressed);
     let mut compressed = tcx.metadata_encoding_version();
-    DeflateEncoder::new(&mut compressed, Compression::fast())
+    FrameEncoder::new(&mut compressed)
         .write_all(&metadata.raw_data)
         .unwrap();
 
     product.add_rustc_section(
-        rustc::middle::exported_symbols::metadata_symbol_name(tcx),
+        rustc_middle::middle::exported_symbols::metadata_symbol_name(tcx),
         compressed,
         tcx.sess.target.target.options.is_like_osx,
     );