From 5fecf59f54ddee44626c3d3d44031fbb1a3470e7 Mon Sep 17 00:00:00 2001
From: Douglas <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sat, 26 Apr 2025 23:00:00 -0400
Subject: [PATCH] Revert "Fix `kv set` with a closure argument" (#15648)

Reverts nushell/nushell#15588 (see comments there)
---
 crates/nu-std/std-rfc/kv/mod.nu        |  2 +-
 crates/nu-std/tests/test_std-rfc_kv.nu | 50 +++++---------------------
 2 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/crates/nu-std/std-rfc/kv/mod.nu b/crates/nu-std/std-rfc/kv/mod.nu
index 31c990fd6a..95d90282e1 100644
--- a/crates/nu-std/std-rfc/kv/mod.nu
+++ b/crates/nu-std/std-rfc/kv/mod.nu
@@ -38,7 +38,7 @@ export def "kv set" [
   # If passed a closure, execute it
   let arg_type = ($value_or_closure | describe)
   let value = match $arg_type {
-    closure => { kv get $key --universal=$universal | do $value_or_closure }
+    closure => { $input | do $value_or_closure }
     _ => ($value_or_closure | default $input)
   }
 
diff --git a/crates/nu-std/tests/test_std-rfc_kv.nu b/crates/nu-std/tests/test_std-rfc_kv.nu
index f30a709dee..84467fceee 100644
--- a/crates/nu-std/tests/test_std-rfc_kv.nu
+++ b/crates/nu-std/tests/test_std-rfc_kv.nu
@@ -83,7 +83,7 @@ def local-transpose_to_record [] {
 }
 
 @test
-def local-using_cellpaths [] {
+def local-using_closure [] {
     if ('sqlite' not-in (version).features) { return }
 
     let key = (random uuid)
@@ -91,8 +91,8 @@ def local-using_cellpaths [] {
     let size_key = (random uuid)
 
     ls
-    | kv set $name_key $in.name
-    | kv set $size_key $in.size
+    | kv set $name_key { get name }
+    | kv set $size_key { get size }
 
     let expected = "list<string>"
     let actual = (kv get $name_key | describe)
@@ -106,22 +106,6 @@ def local-using_cellpaths [] {
     kv drop $size_key
 }
 
-@test
-def local-using_closure [] {
-    if ('sqlite' not-in (version).features) { return }
-
-    let key = (random uuid)
-
-    kv set $key 5
-    kv set $key { $in + 1 }
-
-    let expected = 6
-    let actual = (kv get $key)
-    assert equal $actual $expected
-
-    kv drop $key
-}
-
 @test
 def local-return-entire-list [] {
     if ('sqlite' not-in (version).features) { return }
@@ -153,7 +137,7 @@ def local-return_value_only [] {
     let key = (random uuid)
 
     let expected = 'VALUE'
-    let actual = ('value' | kv set -r v $key ($in | str upcase))
+    let actual = ('value' | kv set -r v $key {str upcase})
 
     assert equal $actual $expected
 
@@ -249,7 +233,7 @@ def universal-transpose_to_record [] {
 }
 
 @test
-def universal-using_cellpaths [] {
+def universal-using_closure [] {
     if ('sqlite' not-in (version).features) { return }
 
     let key = (random uuid)
@@ -259,8 +243,8 @@ def universal-using_cellpaths [] {
     let size_key = (random uuid)
 
     ls
-    | kv set -u $name_key $in.name
-    | kv set -u $size_key $in.size
+    | kv set -u $name_key { get name }
+    | kv set -u $size_key { get size }
 
     let expected = "list<string>"
     let actual = (kv get -u $name_key | describe)
@@ -275,24 +259,6 @@ def universal-using_cellpaths [] {
     rm $env.NU_UNIVERSAL_KV_PATH
 }
 
-@test
-def universal-using_closure [] {
-    if ('sqlite' not-in (version).features) { return }
-
-    let key = (random uuid)
-    $env.NU_UNIVERSAL_KV_PATH = (mktemp -t --suffix .sqlite3)
-
-    kv set -u $key 5
-    kv set -u $key { $in + 1 }
-
-    let expected = 6
-    let actual = (kv get -u $key)
-    assert equal $actual $expected
-
-    kv drop -u $key
-    rm $env.NU_UNIVERSAL_KV_PATH
-}
-
 @test
 def universal-return-entire-list [] {
     if ('sqlite' not-in (version).features) { return }
@@ -329,7 +295,7 @@ def universal-return_value_only [] {
     let key = (random uuid)
 
     let expected = 'VALUE'
-    let actual = ('value' | kv set --universal -r v $key ($in | str upcase))
+    let actual = ('value' | kv set --universal -r v $key {str upcase})
 
     assert equal $actual $expected