archive-gh-me/maplibre-rs
1
0
Fork 0
mirror of https://github.com/maplibre/maplibre-rs.git synced 2025-12-08 19:05:57 +00:00
Code Issues Projects Releases Wiki Activity

Remove mem::replace usage

Browse Source
This commit is contained in:
Maximilian Ammann 2022-05-31 20:49:03 +02:00
parent 79a4f6d195
commit e1706b0228
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
maplibre/src/map_schedule.rs
View File

@ -47,15 +47,12 @@ impl EventuallyMapContext {
tile_repository,
..
}) => {
mem::replace(
self,
EventuallyMapContext::Full(MapContext {
view_state,
style,
tile_repository,
renderer,
}),
);
*self = EventuallyMapContext::Full(MapContext {
view_state,
style,
tile_repository,
renderer,
});
}
EventuallyMapContext::_Uninitialized => {}
}

4
maplibre/src/render/util/mod.rs
View File

@ -79,7 +79,7 @@ where
};
if should_replace {
mem::replace(self, Eventually::Initialized(f()));
*self = Eventually::Initialized(f());
}
}
}
@ -87,7 +87,7 @@ impl<T> Eventually<T> {
#[tracing::instrument(name = "initialize", skip_all)]
pub fn initialize(&mut self, f: impl FnOnce() -> T) {
if let Eventually::Uninitialized = self {
mem::replace(self, Eventually::Initialized(f()));
*self = Eventually::Initialized(f());
}
}