Removed some TODOs for Crystal 0.18

crystal-lang · Jun 15, 2016 · fd0f67b · fd0f67b
1 parent 71bca5d
commit fd0f67b
Showing 7 changed files with 22 additions and 44 deletions.
diff --git a/spec/std/named_tuple_spec.cr b/spec/std/named_tuple_spec.cr
@@ -26,8 +26,7 @@ describe "NamedTuple" do
       NamedTuple(foo: Int32, bar: Int32).from({:foo => 1, :baz => 2})
     end
 
-    # TODO: simplify regex and use TypeCastError after 0.18
-    expect_raises(Exception, /cast (?:from String )?to Int32 failed/) do
+    expect_raises(TypeCastError, /cast from String to Int32 failed/) do
       NamedTuple(foo: Int32, bar: Int32).from({:foo => 1, :bar => "foo"})
     end
   end
@@ -49,8 +48,7 @@ describe "NamedTuple" do
       {foo: Int32, bar: Int32}.from({:foo => 1, :baz => 2})
     end
 
-    # TODO: simplify regex and use TypeCastError after 0.18
-    expect_raises(Exception, /cast (?:from String )?to Int32 failed/) do
+    expect_raises(TypeCastError, /cast from String to Int32 failed/) do
       {foo: Int32, bar: Int32}.from({:foo => 1, :bar => "foo"})
     end
   end

diff --git a/spec/std/openssl/ssl/context_spec.cr b/spec/std/openssl/ssl/context_spec.cr
@@ -4,21 +4,21 @@ require "openssl"
 describe OpenSSL::SSL::Context do
   it "new for client" do
     context = OpenSSL::SSL::Context::Client.new
-    context.options.should eq(OpenSSL::SSL.options_flags(
+    context.options.should eq(OpenSSL::SSL::Options.flags(
       ALL, NO_SSLV2, NO_SSLV3, NO_SESSION_RESUMPTION_ON_RENEGOTIATION, SINGLE_ECDH_USE, SINGLE_DH_USE
     ))
-    context.modes.should eq(OpenSSL::SSL.modes_flags(AUTO_RETRY, RELEASE_BUFFERS))
+    context.modes.should eq(OpenSSL::SSL::Modes.flags(AUTO_RETRY, RELEASE_BUFFERS))
     context.verify_mode.should eq(OpenSSL::SSL::VerifyMode::PEER)
 
     OpenSSL::SSL::Context::Client.new(LibSSL.tlsv1_method)
   end
 
   it "new for server" do
     context = OpenSSL::SSL::Context::Server.new
-    context.options.should eq(OpenSSL::SSL.options_flags(
+    context.options.should eq(OpenSSL::SSL::Options.flags(
       ALL, NO_SSLV2, NO_SSLV3, NO_SESSION_RESUMPTION_ON_RENEGOTIATION, SINGLE_ECDH_USE, SINGLE_DH_USE, CIPHER_SERVER_PREFERENCE
     ))
-    context.modes.should eq(OpenSSL::SSL.modes_flags(AUTO_RETRY, RELEASE_BUFFERS))
+    context.modes.should eq(OpenSSL::SSL::Modes.flags(AUTO_RETRY, RELEASE_BUFFERS))
     context.verify_mode.should eq(OpenSSL::SSL::VerifyMode::NONE)
 
     OpenSSL::SSL::Context::Server.new(LibSSL.tlsv1_method)
@@ -81,39 +81,39 @@ describe OpenSSL::SSL::Context do
     context = OpenSSL::SSL::Context::Client.new
     context.remove_options(context.options) # reset
     context.add_options(OpenSSL::SSL::Options::ALL).should eq(OpenSSL::SSL::Options::ALL)
-    context.add_options(OpenSSL::SSL.options_flags(NO_SSLV2, NO_SSLV3))
-           .should eq(OpenSSL::SSL.options_flags(ALL, NO_SSLV2, NO_SSLV3))
+    context.add_options(OpenSSL::SSL::Options.flags(NO_SSLV2, NO_SSLV3))
+           .should eq(OpenSSL::SSL::Options.flags(ALL, NO_SSLV2, NO_SSLV3))
   end
 
   it "removes options" do
     context = OpenSSL::SSL::Context::Client.insecure
-    context.add_options(OpenSSL::SSL.options_flags(ALL, NO_SSLV2))
+    context.add_options(OpenSSL::SSL::Options.flags(ALL, NO_SSLV2))
     context.remove_options(OpenSSL::SSL::Options::ALL).should eq(OpenSSL::SSL::Options::NO_SSLV2)
   end
 
   it "returns options" do
     context = OpenSSL::SSL::Context::Client.insecure
-    context.add_options(OpenSSL::SSL.options_flags(ALL, NO_SSLV2))
-    context.options.should eq(OpenSSL::SSL.options_flags(ALL, NO_SSLV2))
+    context.add_options(OpenSSL::SSL::Options.flags(ALL, NO_SSLV2))
+    context.options.should eq(OpenSSL::SSL::Options.flags(ALL, NO_SSLV2))
   end
 
   it "adds modes" do
     context = OpenSSL::SSL::Context::Client.insecure
     context.add_modes(OpenSSL::SSL::Modes::AUTO_RETRY).should eq(OpenSSL::SSL::Modes::AUTO_RETRY)
     context.add_modes(OpenSSL::SSL::Modes::RELEASE_BUFFERS)
-           .should eq(OpenSSL::SSL.modes_flags(AUTO_RETRY, RELEASE_BUFFERS))
+           .should eq(OpenSSL::SSL::Modes.flags(AUTO_RETRY, RELEASE_BUFFERS))
   end
 
   it "removes modes" do
     context = OpenSSL::SSL::Context::Client.insecure
-    context.add_modes(OpenSSL::SSL.modes_flags(AUTO_RETRY, RELEASE_BUFFERS))
+    context.add_modes(OpenSSL::SSL::Modes.flags(AUTO_RETRY, RELEASE_BUFFERS))
     context.remove_modes(OpenSSL::SSL::Modes::AUTO_RETRY).should eq(OpenSSL::SSL::Modes::RELEASE_BUFFERS)
   end
 
   it "returns modes" do
     context = OpenSSL::SSL::Context::Client.insecure
-    context.add_modes(OpenSSL::SSL.modes_flags(AUTO_RETRY, RELEASE_BUFFERS))
-    context.modes.should eq(OpenSSL::SSL.modes_flags(AUTO_RETRY, RELEASE_BUFFERS))
+    context.add_modes(OpenSSL::SSL::Modes.flags(AUTO_RETRY, RELEASE_BUFFERS))
+    context.modes.should eq(OpenSSL::SSL::Modes.flags(AUTO_RETRY, RELEASE_BUFFERS))
   end
 
   it "sets the verify mode" do

diff --git a/spec/std/tuple_spec.cr b/spec/std/tuple_spec.cr
@@ -155,8 +155,7 @@ describe "Tuple" do
       Tuple(Int32).from([1, 2])
     end
 
-    # TODO: simplify regex and use TypeCastError after 0.18
-    expect_raises(Exception, /cast (?:from String )?to Int32 failed/) do
+    expect_raises(TypeCastError, /cast from String to Int32 failed/) do
       Tuple(Int32, String).from(["foo", 1])
     end
   end
@@ -170,8 +169,7 @@ describe "Tuple" do
       {Int32}.from([1, 2])
     end
 
-    # TODO: simplify regex and use TypeCastError after 0.18
-    expect_raises(Exception, /cast (?:from String )?to Int32 failed/) do
+    expect_raises(TypeCastError, /cast from String to Int32 failed/) do
       {Int32, String}.from(["foo", 1])
     end
   end

diff --git a/src/hash.cr b/src/hash.cr
@@ -398,11 +398,8 @@ class Hash(K, V)
   # h.key_index("qux") # => nil
   # ```
   def key_index(key)
-    # TODO: use each_with_index
-    i = 0
-    each do |my_key, my_value|
-      return i if key == my_key
-      i += 1
+    each_with_index do |(my_key, my_value), index|
+      return index if key == my_key
     end
     nil
   end

diff --git a/src/http/headers.cr b/src/http/headers.cr
@@ -210,9 +210,7 @@ struct HTTP::Headers
 
   def to_s(io : IO)
     io << "HTTP::Headers{"
-    # TODO: use each_with_index
-    index = 0
-    @hash.each do |key, values|
+    @hash.each_with_index do |(key, values), index|
       io << ", " if index > 0
       key.name.inspect(io)
       io << " => "
@@ -221,7 +219,6 @@ struct HTTP::Headers
       else
         values.inspect(io)
       end
-      index += 1
     end
     io << "}"
   end

diff --git a/src/openssl.cr b/src/openssl.cr
@@ -31,18 +31,6 @@ module OpenSSL
     alias X509VerifyFlags = LibCrypto::X509VerifyFlags
     {% end %}
 
-    # TODO: remove these after 0.18.0
-
-    # :nodoc:
-    macro options_flags(*flags)
-      LibSSL::Options.flags({{*flags}})
-    end
-
-    # :nodoc:
-    macro modes_flags(*flags)
-      LibSSL::Modes.flags({{*flags}})
-    end
-
     class Error < OpenSSL::Error
       getter error : ErrorType
 

diff --git a/src/openssl/ssl/context.cr b/src/openssl/ssl/context.cr
@@ -136,7 +136,7 @@ abstract class OpenSSL::SSL::Context
 
     set_default_verify_paths
 
-    add_options(OpenSSL::SSL.options_flags(
+    add_options(OpenSSL::SSL::Options.flags(
       ALL,
       NO_SSLV2,
       NO_SSLV3,
@@ -145,7 +145,7 @@ abstract class OpenSSL::SSL::Context
       SINGLE_DH_USE
     ))
 
-    add_modes(OpenSSL::SSL.modes_flags(AUTO_RETRY, RELEASE_BUFFERS))
+    add_modes(OpenSSL::SSL::Modes.flags(AUTO_RETRY, RELEASE_BUFFERS))
 
     self.ciphers = CIPHERS