Auto merge of #67502 - Mark-Simulacrum:opt-catch, r=Mark-Simulacrum

[rust.git] / src / librustc_codegen_llvm / metadata.rs

diff --git a/src/librustc_codegen_llvm/metadata.rs b/src/librustc_codegen_llvm/metadata.rs
index bbe42e3b50a2ceb5df4533130b4943875906046d..0f30c2c020de75a225356a567d6d1be386435ffc 100644 (file)
--- a/src/librustc_codegen_llvm/metadata.rs
+++ b/src/librustc_codegen_llvm/metadata.rs
@@ -1,17 +1,17 @@
 use crate::llvm;
-use crate::llvm::{False, ObjectFile, mk_section_iter};
 use crate::llvm::archive_ro::ArchiveRO;
+use crate::llvm::{mk_section_iter, False, ObjectFile};
 use rustc::middle::cstore::MetadataLoader;
 use rustc_target::spec::Target;
 
-use rustc_data_structures::owning_ref::OwningRef;
-use rustc_codegen_ssa::METADATA_FILENAME;
 use log::debug;
+use rustc_codegen_ssa::METADATA_FILENAME;
+use rustc_data_structures::owning_ref::OwningRef;
 use rustc_data_structures::rustc_erase_owner;
 
+use rustc_fs_util::path_to_c_string;
 use std::path::Path;
 use std::slice;
-use rustc_fs_util::path_to_c_string;
 
 pub use rustc_data_structures::sync::MetadataRef;
 
@@ -22,49 +22,44 @@ fn get_rlib_metadata(&self, _: &Target, filename: &Path) -> Result<MetadataRef,
         // Use ArchiveRO for speed here, it's backed by LLVM and uses mmap
         // internally to read the file. We also avoid even using a memcpy by
         // just keeping the archive along while the metadata is in use.
-        let archive = ArchiveRO::open(filename)
-            .map(|ar| OwningRef::new(box ar))
-            .map_err(|e| {
+        let archive =
+            ArchiveRO::open(filename).map(|ar| OwningRef::new(Box::new(ar))).map_err(|e| {
                 debug!("llvm didn't like `{}`: {}", filename.display(), e);
                 format!("failed to read rlib metadata in '{}': {}", filename.display(), e)
             })?;
-        let buf: OwningRef<_, [u8]> = archive
-            .try_map(|ar| {
-                ar.iter()
-                    .filter_map(|s| s.ok())
-                    .find(|sect| sect.name() == Some(METADATA_FILENAME))
-                    .map(|s| s.data())
-                    .ok_or_else(|| {
-                        debug!("didn't find '{}' in the archive", METADATA_FILENAME);
-                        format!("failed to read rlib metadata: '{}'",
-                                filename.display())
-                    })
-            })?;
+        let buf: OwningRef<_, [u8]> = archive.try_map(|ar| {
+            ar.iter()
+                .filter_map(|s| s.ok())
+                .find(|sect| sect.name() == Some(METADATA_FILENAME))
+                .map(|s| s.data())
+                .ok_or_else(|| {
+                    debug!("didn't find '{}' in the archive", METADATA_FILENAME);
+                    format!("failed to read rlib metadata: '{}'", filename.display())
+                })
+        })?;
         Ok(rustc_erase_owner!(buf))
     }
 
-    fn get_dylib_metadata(&self,
-                          target: &Target,
-                          filename: &Path)
-                          -> Result<MetadataRef, String> {
+    fn get_dylib_metadata(&self, target: &Target, filename: &Path) -> Result<MetadataRef, String> {
         unsafe {
             let buf = path_to_c_string(filename);
             let mb = llvm::LLVMRustCreateMemoryBufferWithContentsOfFile(buf.as_ptr())
                 .ok_or_else(|| format!("error reading library: '{}'", filename.display()))?;
-            let of = ObjectFile::new(mb)
-                .map(|of| OwningRef::new(box of))
-                .ok_or_else(|| format!("provided path not an object file: '{}'",
-                                       filename.display()))?;
+            let of =
+                ObjectFile::new(mb).map(|of| OwningRef::new(Box::new(of))).ok_or_else(|| {
+                    format!("provided path not an object file: '{}'", filename.display())
+                })?;
             let buf = of.try_map(|of| search_meta_section(of, target, filename))?;
             Ok(rustc_erase_owner!(buf))
         }
     }
 }
 
-fn search_meta_section<'a>(of: &'a ObjectFile,
-                           target: &Target,
-                           filename: &Path)
-                           -> Result<&'a [u8], String> {
+fn search_meta_section<'a>(
+    of: &'a ObjectFile,
+    target: &Target,
+    filename: &Path,
+) -> Result<&'a [u8], String> {
     unsafe {
         let si = mk_section_iter(of.llof);
         while llvm::LLVMIsSectionIteratorAtEnd(of.llof, si.llsi) == False {
@@ -72,11 +67,13 @@ fn search_meta_section<'a>(of: &'a ObjectFile,
             let name_len = llvm::LLVMRustGetSectionName(si.llsi, &mut name_buf);
             let name = name_buf.map_or(
                 String::new(), // We got a NULL ptr, ignore `name_len`.
-                |buf| String::from_utf8(
-                    slice::from_raw_parts(buf.as_ptr() as *const u8,
-                                          name_len as usize)
-                    .to_vec()
-                ).unwrap()
+                |buf| {
+                    String::from_utf8(
+                        slice::from_raw_parts(buf.as_ptr() as *const u8, name_len as usize)
+                            .to_vec(),
+                    )
+                    .unwrap()
+                },
             );
             debug!("get_metadata_section: name {}", name);
             if read_metadata_section_name(target) == name {
@@ -102,16 +99,12 @@ pub fn metadata_section_name(target: &Target) -> &'static str {
     // > Executable images do not use a string table and do not support
     // > section names longer than 8 characters
     //
-    // https://msdn.microsoft.com/en-us/library/windows/hardware/gg463119.aspx
+    // https://docs.microsoft.com/en-us/windows/win32/debug/pe-format
     //
     // As a result, we choose a slightly shorter name! As to why
     // `.note.rustc` works on MinGW, that's another good question...
 
-    if target.options.is_like_osx {
-        "__DATA,.rustc"
-    } else {
-        ".rustc"
-    }
+    if target.options.is_like_osx { "__DATA,.rustc" } else { ".rustc" }
 }
 
 fn read_metadata_section_name(_target: &Target) -> &'static str {