Bump to object 0.25.0 (#426)

Author: alexcrichton

Cargo.toml

@@ -38,7 +38,7 @@ cpp_demangle = { default-features = false, version = "0.3.0", optional = true }
 addr2line = { version = "0.15.1", default-features = false }
 miniz_oxide = { version = "0.4.0", default-features = false }
 [dependencies.object]
-version = "0.24"
+version = "0.25"
 default-features = false
 features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']
 
@@ -52,7 +52,7 @@ cc = "1.0.67"
 
 [dev-dependencies]
 dylib-dep = { path = "crates/dylib-dep" }
-libloading = "0.6"
+libloading = "0.7"
 
 [features]
 # By default libstd support and gimli-symbolize is used to symbolize addresses.

crates/as-if-std/Cargo.toml

@@ -19,7 +19,7 @@ addr2line = { version = "0.15.1", default-features = false }
 miniz_oxide = { version = "0.4.0", default-features = false }
 
 [dependencies.object]
-version = "0.24"
+version = "0.25"
 default-features = false
 features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']
 

src/symbolize/gimli/libs_macos.rs

@@ -47,7 +47,7 @@ fn native_library(i: u32) -> Option<Library> {
                     header as *const _ as *const u8,
                     mem::size_of_val(header) + header.sizeofcmds.get(endian) as usize,
                 );
-                (header.load_commands(endian, data).ok()?, endian)
+                (header.load_commands(endian, data, 0).ok()?, endian)
             }
             macho::MH_MAGIC_64 => {
                 let endian = NativeEndian;
@@ -56,7 +56,7 @@ fn native_library(i: u32) -> Option<Library> {
                     header as *const _ as *const u8,
                     mem::size_of_val(header) + header.sizeofcmds.get(endian) as usize,
                 );
-                (header.load_commands(endian, data).ok()?, endian)
+                (header.load_commands(endian, data, 0).ok()?, endian)
             }
             _ => return None,
         }

src/symbolize/gimli/macho.rs

@@ -22,7 +22,7 @@ impl Mapping {
         let map = super::mmap(path)?;
         let (macho, data) = find_header(&map)?;
         let endian = macho.endian().ok()?;
-        let uuid = macho.uuid(endian, data).ok()??;
+        let uuid = macho.uuid(endian, data, 0).ok()??;
 
         // Next we need to look for a `*.dSYM` file. For now we just probe the
         // containing directory and look around for something that matches
@@ -75,7 +75,7 @@ impl Mapping {
             let candidate = Mapping::mk(map, |data, stash| {
                 let (macho, data) = find_header(data)?;
                 let endian = macho.endian().ok()?;
-                let entry_uuid = macho.uuid(endian, data).ok()??;
+                let entry_uuid = macho.uuid(endian, data, 0).ok()??;
                 if entry_uuid != uuid {
                     return None;
                 }
@@ -150,7 +150,7 @@ fn find_header(data: &'_ [u8]) -> Option<(&'_ Mach, &'_ [u8])> {
         _ => return None,
     }
 
-    Mach::parse(data.0).ok().map(|h| (h, data.0))
+    Mach::parse(data.0, 0).ok().map(|h| (h, data.0))
 }
 
 // This is used both for executables/libraries and source object files.
@@ -172,7 +172,7 @@ impl<'a> Object<'a> {
         let mut dwarf = None;
         let mut syms = Vec::new();
         let mut syms_sort_by_name = false;
-        let mut commands = mach.load_commands(endian, data).ok()?;
+        let mut commands = mach.load_commands(endian, data, 0).ok()?;
         let mut object_map = None;
         let mut object_mappings = Vec::new();
         while let Ok(Some(command)) = commands.next() {

tests/accuracy/main.rs

@@ -34,11 +34,13 @@ fn doit() {
         } else {
             dir.push("libdylib_dep.so");
         }
-        let lib = libloading::Library::new(&dir).unwrap();
-        let api = unsafe { lib.get::<extern "C" fn(Pos, fn(Pos, Pos))>(b"foo").unwrap() };
-        api(pos!(), |a, b| {
-            check!(a, b);
-        });
+        unsafe {
+            let lib = libloading::Library::new(&dir).unwrap();
+            let api = lib.get::<extern "C" fn(Pos, fn(Pos, Pos))>(b"foo").unwrap();
+            api(pos!(), |a, b| {
+                check!(a, b);
+            });
+        }
     }
 
     outer(pos!());