Skip to content

Fix compilation on latest nightly #769

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.

Sign up for GitHub

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
seanmonstar merged 1 commit into from
May 21, 2025
+6 −6
Merged

Fix compilation on latest nightly #769

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/header/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2315,15 +2315,15 @@ impl<'a, T> IterMut<'a, T> {
self.cursor = Some(Cursor::Head);
}

let entry = unsafe { &mut (*self.map).entries[self.entry] };
let entry = &mut unsafe { &mut *self.map }.entries[self.entry];

match self.cursor.unwrap() {
Head => {
self.cursor = entry.links.map(|l| Values(l.next));
Some((&entry.key, &mut entry.value as *mut _))
}
Values(idx) => {
let extra = unsafe { &mut (*self.map).extra_values[idx] };
let extra = &mut unsafe { &mut (*self.map) }.extra_values[idx];

match extra.next {
Link::Entry(_) => self.cursor = None,
Expand Down Expand Up @@ -2963,7 +2963,7 @@ impl<'a, T: 'a> Iterator for ValueIterMut<'a, T> {
fn next(&mut self) -> Option<Self::Item> {
use self::Cursor::*;

let entry = unsafe { &mut (*self.map).entries[self.index] };
let entry = &mut unsafe { &mut *self.map }.entries[self.index];

match self.front {
Some(Head) => {
Expand All @@ -2983,7 +2983,7 @@ impl<'a, T: 'a> Iterator for ValueIterMut<'a, T> {
Some(&mut entry.value)
}
Some(Values(idx)) => {
let extra = unsafe { &mut (*self.map).extra_values[idx] };
let extra = &mut unsafe { &mut *self.map }.extra_values[idx];

if self.front == self.back {
self.front = None;
Expand All @@ -3006,7 +3006,7 @@ impl<'a, T: 'a> DoubleEndedIterator for ValueIterMut<'a, T> {
fn next_back(&mut self) -> Option<Self::Item> {
use self::Cursor::*;

let entry = unsafe { &mut (*self.map).entries[self.index] };
let entry = &mut unsafe { &mut *self.map }.entries[self.index];

match self.back {
Some(Head) => {
Expand All @@ -3015,7 +3015,7 @@ impl<'a, T: 'a> DoubleEndedIterator for ValueIterMut<'a, T> {
Some(&mut entry.value)
}
Some(Values(idx)) => {
let extra = unsafe { &mut (*self.map).extra_values[idx] };
let extra = &mut unsafe { &mut *self.map }.extra_values[idx];

if self.front == self.back {
self.front = None;
Expand Down
Loading