From 3f5c64f50ff3fe456fe8aa0515622c91b2d5801d Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <idscott@system76.com>
Date: Mon, 23 Dec 2024 16:05:28 -0800
Subject: [PATCH] Use `HashMap` entry API in a cleaner way

Careful use of the right `VacantEntry` and `OccupiedEntry` methods makes
this possible without hacks or lifetime errors.
---
 src/backend/kms/surface/mod.rs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/backend/kms/surface/mod.rs b/src/backend/kms/surface/mod.rs
index 37b27f70..456744c2 100644
--- a/src/backend/kms/surface/mod.rs
+++ b/src/backend/kms/surface/mod.rs
@@ -75,7 +75,7 @@ use tracing::{error, trace, warn};
 
 use std::{
     borrow::BorrowMut,
-    collections::{HashMap, HashSet},
+    collections::{hash_map, HashMap, HashSet},
     mem,
     sync::{
         atomic::{AtomicBool, Ordering},
@@ -1060,18 +1060,15 @@ impl SurfaceThreadState {
             }) || mirrored_output.current_scale().fractional_scale()
                 != self.output.current_scale().fractional_scale()
         }) {
-            let mirroring_state = {
-                let entry = self.mirroring_textures.entry(self.target_node);
-                let mut new_state = None;
-                if matches!(entry, std::collections::hash_map::Entry::Vacant(_)) {
-                    new_state = Some(MirroringState::new_with_renderer(
+            let mirroring_state = match self.mirroring_textures.entry(self.target_node) {
+                hash_map::Entry::Occupied(occupied) => occupied.into_mut(),
+                hash_map::Entry::Vacant(vacant) => {
+                    vacant.insert(MirroringState::new_with_renderer(
                         &mut renderer,
                         compositor.format(),
                         mirrored_output,
-                    )?);
+                    )?)
                 }
-                // I really want a failable initializer...
-                entry.or_insert_with(|| new_state.unwrap())
             };
 
             mirroring_state