From f94e83faa04d99a6deac49b8c0a14c585aeea59a Mon Sep 17 00:00:00 2001
From: Samuel Williams <samuel.williams@oriontransfer.co.nz>
Date: Sat, 25 Feb 2023 19:27:11 +1300
Subject: Assigning `nil` to fiber storage deletes the association. (#7378)

Also avoid allocations when looking up `Fiber#storage` if not needed.
---
 spec/ruby/core/fiber/storage_spec.rb | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'spec/ruby')

diff --git a/spec/ruby/core/fiber/storage_spec.rb b/spec/ruby/core/fiber/storage_spec.rb
index 98215ebd59..e99fe6e4df 100644
--- a/spec/ruby/core/fiber/storage_spec.rb
+++ b/spec/ruby/core/fiber/storage_spec.rb
@@ -11,7 +11,7 @@ describe "Fiber.new(storage:)" do
     end
 
     it "creates a fiber with lazily initialized storage" do
-      Fiber.new(storage: nil) { Fiber.current.storage }.resume.should == {}
+      Fiber.new(storage: nil) { Fiber[:x] = 10; Fiber.current.storage }.resume.should == {x: 10}
     end
 
     it "creates a fiber by inheriting the storage of the parent fiber" do
@@ -30,18 +30,19 @@ end
 describe "Fiber#storage=" do
   ruby_version_is "3.2" do
     it "can clear the storage of the fiber" do
-      fiber = Fiber.new(storage: {life: 42}) {
+      fiber = Fiber.new(storage: {life: 42}) do
         Fiber.current.storage = nil
+        Fiber[:x] = 10
         Fiber.current.storage
-      }
-      fiber.resume.should == {}
+      end
+      fiber.resume.should == {x: 10}
     end
 
     it "can set the storage of the fiber" do
-      fiber = Fiber.new(storage: {life: 42}) {
+      fiber = Fiber.new(storage: {life: 42}) do
         Fiber.current.storage = {life: 43}
         Fiber.current.storage
-      }
+      end
       fiber.resume.should == {life: 43}
     end
 
@@ -89,6 +90,12 @@ describe "Fiber.[]=" do
       Fiber.new { Fiber[:life] = 43; Fiber[:life] }.resume.should == 43
     end
   end
+
+  ruby_version_is "3.3" do
+    it "deletes the fiber storage key when assigning nil" do
+      Fiber.new(storage: {life: 42}) { Fiber[:life] = nil; Fiber.current.storage }.resume.should == {}
+    end
+  end
 end
 
 describe "Thread.new" do
-- 
cgit v1.2.1