From adbf51213a0df5d645d3d9423f0b284f5aff9a4e Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Thu, 30 Jan 2020 14:13:09 +0000
Subject: Remove use of take_mut

---
 Cargo.lock                        |  7 ------
 dhall/Cargo.toml                  |  1 -
 dhall/src/semantics/core/value.rs | 47 ++++++++++++++++++---------------------
 3 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d3684eb..de3fc27 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -99,7 +99,6 @@ dependencies = [
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_cbor 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -442,11 +441,6 @@ dependencies = [
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "take_mut"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "typed-arena"
 version = "1.7.0"
@@ -561,7 +555,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4"
 "checksum static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7f3eb36b47e512f8f1c9e3d10c2c1965bc992bd9cdb024fa581e2194501c83d3"
 "checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238"
-"checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 "checksum typed-arena 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d"
 "checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
 "checksum ucd-trie 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8f00ed7be0c1ff1e24f46c3d2af4859f7e863672ba3a6e92e7cff702bf9f06c2"
diff --git a/dhall/Cargo.toml b/dhall/Cargo.toml
index b795898..1479eaa 100644
--- a/dhall/Cargo.toml
+++ b/dhall/Cargo.toml
@@ -19,7 +19,6 @@ pest_consume = "1.0"
 serde = "1.0"
 serde_cbor = "0.9.0"
 smallvec = "1.0.0"
-take_mut = "0.2.2"
 
 [dev-dependencies]
 pretty_assertions = "0.6.1"
diff --git a/dhall/src/semantics/core/value.rs b/dhall/src/semantics/core/value.rs
index 0fda870..f6d273c 100644
--- a/dhall/src/semantics/core/value.rs
+++ b/dhall/src/semantics/core/value.rs
@@ -412,33 +412,30 @@ impl ValueInternal {
     }
 
     fn normalize_whnf(&mut self) {
-        take_mut::take_or_recover(
-            self,
-            // Dummy value in case the other closure panics
-            || ValueInternal {
-                form: Unevaled,
-                kind: ValueKind::Const(Const::Type),
-                ty: None,
-                span: Span::Artificial,
+        let dummy = ValueInternal {
+            form: Unevaled,
+            kind: ValueKind::Const(Const::Type),
+            ty: None,
+            span: Span::Artificial,
+        };
+        let vint = std::mem::replace(self, dummy);
+        *self = match (&vint.form, &vint.ty) {
+            (Unevaled, Some(ty)) => ValueInternal {
+                form: WHNF,
+                kind: normalize_whnf(vint.kind, &ty),
+                ty: vint.ty,
+                span: vint.span,
             },
-            |vint| match (&vint.form, &vint.ty) {
-                (Unevaled, Some(ty)) => ValueInternal {
-                    form: WHNF,
-                    kind: normalize_whnf(vint.kind, &ty),
-                    ty: vint.ty,
-                    span: vint.span,
-                },
-                // `value` is `Sort`
-                (Unevaled, None) => ValueInternal {
-                    form: NF,
-                    kind: ValueKind::Const(Const::Sort),
-                    ty: None,
-                    span: vint.span,
-                },
-                // Already in WHNF
-                (WHNF, _) | (NF, _) => vint,
+            // `value` is `Sort`
+            (Unevaled, None) => ValueInternal {
+                form: NF,
+                kind: ValueKind::Const(Const::Sort),
+                ty: None,
+                span: vint.span,
             },
-        )
+            // Already in WHNF
+            (WHNF, _) | (NF, _) => vint,
+        }
     }
     fn normalize_nf(&mut self) {
         match self.form {
-- 
cgit v1.2.3