Merge pull request #1248 from nicholasbishop/bishop-mmap-drop

phip1611 · web-flow · commit 2f806e3368f9 · 2024-07-21T07:13:04.000Z
boot: Always impl Drop for MemoryMapBackingMemory
diff --git a/uefi/src/table/boot.rs b/uefi/src/table/boot.rs
@@ -1737,8 +1737,6 @@ impl MemoryMapBackingMemory {
     }
 }
 
-// Don't drop when we use this in unit tests.
-#[cfg(not(test))]
 impl Drop for MemoryMapBackingMemory {
     fn drop(&mut self) {
         if let Some(bs) = system_table_boot() {
@@ -1747,7 +1745,7 @@ impl Drop for MemoryMapBackingMemory {
                 log::error!("Failed to deallocate memory map: {e:?}");
             }
         } else {
-            log::debug!("Boot services are excited. Memory map won't be freed using the UEFI boot services allocator.");
+            log::debug!("Boot services are exited. Memory map won't be freed using the UEFI boot services allocator.");
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1737,8 +1737,6 @@ impl MemoryMapBackingMemory {`
`1737`	`1737`	`}`
`1738`	`1738`	`}`
`1739`	`1739`
`1740`		`-// Don't drop when we use this in unit tests.`
`1741`		`-#[cfg(not(test))]`
`1742`	`174 7860 0`	`impl Drop for MemoryMapBackingMemory {`
`1743`	`1741`	`fn drop(&mut self) {`
`1744`	`1742`	`if let Some(bs) = system_table_boot() {`
`@@ -1747,7 +1745,7 @@ impl Drop for MemoryMapBackingMemory {`
`1747`	`1745`	`log::error!("Failed to deallocate memory map: {e:?}");`
`1748`	`1746`	`}`
`1749`	`1747`	`} else {`
`1750`		`- log::debug!("Boot services are excited. Memory map won't be freed using the UEFI boot services allocator.");`
	`1748`	`+ log::debug!("Boot services are exited. Memory map won't be freed using the UEFI boot services allocator.");`
`1751`	`1749`	`}`
`1752`	`1750`	`}`
`1753`	`1751`	`}`