Skip to content

boot: Always impl Drop for MemoryMapBackingMemory #1248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2024

Conversation

nicholasbishop
Copy link
Member

Gating this on cfg(not(test)) isn't necessary; during unit tests system_table_boot() will return None and so the drop won't do anything anyway.

Also fix a typo, excited -> exited.

Checklist

  • Sensible git history (for example, squash "typo" or "fix" commits). See the Rewriting History guide for help.
  • Update the changelog (if necessary)

Gating this on `cfg(not(test))` isn't necessary; during unit tests
`system_table_boot()` will return `None` and so the drop won't do anything
anyway.

Also fix a typo, excited -> exited.
@@ -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.");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Boot services are excited

🤣

@phip1611 phip1611 added this pull request to the merge queue Jul 21, 2024
Merged via the queue into rust-osdev:main with commit 2f806e3 Jul 21, 2024
12 checks passed
@nicholasbishop nicholasbishop deleted the bishop-mmap-drop branch July 21, 2024 11:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants