Have Mmap take ownership of File

Author: CraftSpider

src/symbolize/gimli.rs

@@ -188,7 +188,7 @@ fn mmap(path: &Path) -> Option<Mmap> {
     let len = file.metadata().ok()?.len().try_into().ok()?;
     // SAFETY: All files we mmap are mmaped by the dynamic linker or the kernel already for the
     //         executable code of the process. Modifying them would cause crashes or UB anyways.
-    unsafe { Mmap::map(&file, len, 0) }
+    unsafe { Mmap::map(file, len, 0) }
 }
 
 cfg_if::cfg_if! {

src/symbolize/gimli/elf.rs

@@ -71,7 +71,7 @@ impl Mapping {
             // NOTE: we map the remainder of the entire archive instead of just the library so we don't have to determine its length
             // SAFETY: See `super::mmap` function
             let map = unsafe {
-                super::mmap::Mmap::map(&file, usize::try_from(len - zip_offset).ok()?, zip_offset)
+                super::mmap::Mmap::map(file, usize::try_from(len - zip_offset).ok()?, zip_offset)
             }?;
 
             Mapping::mk(map, |map, stash| {

src/symbolize/gimli/mmap_fake.rs

@@ -12,7 +12,7 @@ impl Mmap {
     ///
     /// # Safety
     /// This function is always safe to call.
-    pub unsafe fn map(mut file: &File, len: usize, offset: u64) -> Option<Mmap> {
+    pub unsafe fn map(mut file: File, len: usize, offset: u64) -> Option<Mmap> {
         let mut mmap = Mmap {
             vec: Vec::with_capacity(len),
         };

src/symbolize/gimli/mmap_unix.rs

@@ -22,7 +22,7 @@ impl Mmap {
     /// - Mapped files must not be altered for the lifetime of the returned value.
     ///
     /// [^1]: https://pubs.opengroup.org/onlinepubs/9699919799.2018edition/functions/mmap.html
-    pub unsafe fn map(file: &File, len: usize, offset: u64) -> Option<Mmap> {
+    pub unsafe fn map(file: File, len: usize, offset: u64) -> Option<Mmap> {
         let ptr = mmap64(
             ptr::null_mut(),
             len,

src/symbolize/gimli/mmap_windows.rs

@@ -23,8 +23,7 @@ impl Mmap {
     /// - Mapped files must not be altered for the lifetime of the returned value.'
     ///
     /// [^1]: https://learn.microsoft.com/en-us/windows/win32/api/memoryapi/nf-memoryapi-mapviewoffile
-    pub unsafe fn map(file: &File, len: usize, offset: u64) -> Option<Mmap> {
-        let file = file.try_clone().ok()?;
+    pub unsafe fn map(file: File, len: usize, offset: u64) -> Option<Mmap> {
         let mapping = CreateFileMappingA(
             file.as_raw_handle(),
             ptr::null_mut(),