Hash: forward initial_capacity to initialize. Fixes #2586 . Fixes #2588

crystal-lang · May 16, 2016 · c0b0e3f · c0b0e3f
1 parent 8027c8d
commit c0b0e3f
Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/spec/std/hash_spec.cr b/spec/std/hash_spec.cr
@@ -714,8 +714,20 @@ describe "Hash" do
     items.uniq.size
   end
 
-  # Check that Hash can be created with an initial capacity
-  typeof(Hash(Int32, Int32).new(initial_capacity: 1234))
-  typeof(Hash(Int32, Int32).new(0, initial_capacity: 1234))
-  typeof(Hash(Int32, Int32).new(initial_capacity: 1234) { |h, k| h[k] = 0 })
+  it "creates with initial capacity" do
+    hash = Hash(Int32, Int32).new(initial_capacity: 1234)
+    hash.@buckets_size.should eq(1234)
+  end
+
+  it "creates with initial capacity and default value" do
+    hash = Hash(Int32, Int32).new(default_value: 3, initial_capacity: 1234)
+    hash[1].should eq(3)
+    hash.@buckets_size.should eq(1234)
+  end
+
+  it "creates with initial capacity and block" do
+    hash = Hash(Int32, Int32).new(initial_capacity: 1234) { |h, k| h[k] = 3 }
+    hash[1].should eq(3)
+    hash.@buckets_size.should eq(1234)
+  end
 end
diff --git a/src/hash.cr b/src/hash.cr
@@ -19,7 +19,7 @@ class Hash(K, V)
   end
 
   def self.new(initial_capacity = nil, &block : (Hash(K, V), K -> V))
-    new block
+    new block, initial_capacity: initial_capacity
   end
 
   def self.new(default_value : V, initial_capacity = nil)