From 115a8109814667d5adeedf55e8192fcaafbb691e Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@red-bean.com>
Date: Sat, 30 Apr 2022 12:09:35 -0700
Subject: [PATCH] [glsl-in] Use `std::mem::take` as appropriate. (#1878)

---
 src/front/glsl/mod.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/front/glsl/mod.rs b/src/front/glsl/mod.rs
index 2d9645ab6d..f28ff7b6ec 100644
--- a/src/front/glsl/mod.rs
+++ b/src/front/glsl/mod.rs
@@ -190,7 +190,7 @@ impl Parser {
         self.layouter.clear();
 
         // This is necessary because if the last parsing errored out, the module
-        // wouldn't have been swapped
+        // wouldn't have been taken
         self.module = Module::default();
     }
 
@@ -213,13 +213,9 @@ impl Parser {
         }
 
         if self.errors.is_empty() {
-            let mut module = Module::default();
-            std::mem::swap(&mut self.module, &mut module);
-            Ok(module)
+            Ok(std::mem::take(&mut self.module))
         } else {
-            let mut errors = Vec::new();
-            std::mem::swap(&mut self.errors, &mut errors);
-            Err(errors)
+            Err(std::mem::take(&mut self.errors))
         }
     }