Rollup merge of #68500 - Mark-Simulacrum:fix-bootstrap-clearing, r=alexcrichton

[rust.git] / src / librustc_codegen_llvm / back / bytecode.rs

diff --git a/src/librustc_codegen_llvm/back/bytecode.rs b/src/librustc_codegen_llvm/back/bytecode.rs
index 8b288c45336b734bca94c76d6d758c3c879cde1c..db29556e70cccd47f5aae3b8d940f396f52fe6a8 100644 (file)
--- a/src/librustc_codegen_llvm/back/bytecode.rs
+++ b/src/librustc_codegen_llvm/back/bytecode.rs
@@ -26,9 +26,9 @@
 use std::ptr;
 use std::str;
 
-use flate2::Compression;
 use flate2::read::DeflateDecoder;
 use flate2::write::DeflateEncoder;
+use flate2::Compression;
 
 // This is the "magic number" expected at the beginning of a LLVM bytecode
 // object in an rlib.
@@ -37,8 +37,6 @@
 // The version number this compiler will write to bytecode objects in rlibs
 pub const RLIB_BYTECODE_OBJECT_VERSION: u8 = 2;
 
-pub const RLIB_BYTECODE_EXTENSION: &str = "bc.z";
-
 pub fn encode(identifier: &str, bytecode: &[u8]) -> Vec<u8> {
     let mut encoded = Vec::new();
 
@@ -51,8 +49,8 @@ pub fn encode(identifier: &str, bytecode: &[u8]) -> Vec<u8> {
     // Next is the LLVM module identifier length + contents
     let identifier_len = identifier.len();
     encoded.extend_from_slice(&[
-        (identifier_len >>  0) as u8,
-        (identifier_len >>  8) as u8,
+        (identifier_len >> 0) as u8,
+        (identifier_len >> 8) as u8,
         (identifier_len >> 16) as u8,
         (identifier_len >> 24) as u8,
     ]);
@@ -64,15 +62,13 @@ pub fn encode(identifier: &str, bytecode: &[u8]) -> Vec<u8> {
     encoded.extend_from_slice(&[0, 0, 0, 0, 0, 0, 0, 0]);
 
     let before = encoded.len();
-    DeflateEncoder::new(&mut encoded, Compression::fast())
-        .write_all(bytecode)
-        .unwrap();
+    DeflateEncoder::new(&mut encoded, Compression::fast()).write_all(bytecode).unwrap();
     let after = encoded.len();
 
     // Fill in the length we reserved space for before
     let bytecode_len = (after - before) as u64;
-    encoded[deflated_size_pos + 0] = (bytecode_len >>  0) as u8;
-    encoded[deflated_size_pos + 1] = (bytecode_len >>  8) as u8;
+    encoded[deflated_size_pos + 0] = (bytecode_len >> 0) as u8;
+    encoded[deflated_size_pos + 1] = (bytecode_len >> 8) as u8;
     encoded[deflated_size_pos + 2] = (bytecode_len >> 16) as u8;
     encoded[deflated_size_pos + 3] = (bytecode_len >> 24) as u8;
     encoded[deflated_size_pos + 4] = (bytecode_len >> 32) as u8;
@@ -87,7 +83,7 @@ pub fn encode(identifier: &str, bytecode: &[u8]) -> Vec<u8> {
         encoded.push(0);
     }
 
-    return encoded
+    return encoded;
 }
 
 pub struct DecodedBytecode<'a> {
@@ -98,50 +94,45 @@ pub struct DecodedBytecode<'a> {
 impl<'a> DecodedBytecode<'a> {
     pub fn new(data: &'a [u8]) -> Result<DecodedBytecode<'a>, &'static str> {
         if !data.starts_with(RLIB_BYTECODE_OBJECT_MAGIC) {
-            return Err("magic bytecode prefix not found")
+            return Err("magic bytecode prefix not found");
         }
         let data = &data[RLIB_BYTECODE_OBJECT_MAGIC.len()..];
         if !data.starts_with(&[RLIB_BYTECODE_OBJECT_VERSION, 0, 0, 0]) {
-            return Err("wrong version prefix found in bytecode")
+            return Err("wrong version prefix found in bytecode");
         }
         let data = &data[4..];
         if data.len() < 4 {
-            return Err("bytecode corrupted")
+            return Err("bytecode corrupted");
         }
-        let identifier_len = unsafe {
-            u32::from_le(ptr::read_unaligned(data.as_ptr() as *const u32)) as usize
-        };
+        let identifier_len =
+            unsafe { u32::from_le(ptr::read_unaligned(data.as_ptr() as *const u32)) as usize };
         let data = &data[4..];
         if data.len() < identifier_len {
-            return Err("bytecode corrupted")
+            return Err("bytecode corrupted");
         }
         let identifier = match str::from_utf8(&data[..identifier_len]) {
             Ok(s) => s,
-            Err(_) => return Err("bytecode corrupted")
+            Err(_) => return Err("bytecode corrupted"),
         };
         let data = &data[identifier_len..];
         if data.len() < 8 {
-            return Err("bytecode corrupted")
+            return Err("bytecode corrupted");
         }
-        let bytecode_len = unsafe {
-            u64::from_le(ptr::read_unaligned(data.as_ptr() as *const u64)) as usize
-        };
+        let bytecode_len =
+            unsafe { u64::from_le(ptr::read_unaligned(data.as_ptr() as *const u64)) as usize };
         let data = &data[8..];
         if data.len() < bytecode_len {
-            return Err("bytecode corrupted")
+            return Err("bytecode corrupted");
         }
         let encoded_bytecode = &data[..bytecode_len];
 
-        Ok(DecodedBytecode {
-            identifier,
-            encoded_bytecode,
-        })
+        Ok(DecodedBytecode { identifier, encoded_bytecode })
     }
 
     pub fn bytecode(&self) -> Vec<u8> {
         let mut data = Vec::new();
         DeflateDecoder::new(self.encoded_bytecode).read_to_end(&mut data).unwrap();
-        return data
+        return data;
     }
 
     pub fn identifier(&self) -> &'a str {