Fix some rubocop offences

Gemfile

@@ -6,7 +6,10 @@ eval_gemfile "Gemfile.devtools"
 
 gemspec
 
-gem "dry-logic", github: "dry-rb/dry-logic", branch: "master" if ENV["DRY_LOGIC_FROM_MASTER"].eql?("true")
+if ENV["DRY_LOGIC_FROM_MASTER"].eql?("true")
+  gem "dry-logic", github: "dry-rb/dry-logic",
+                   branch: "master"
+end
 
 group :test do
   gem "dry-struct"

lib/dry/types.rb

@@ -29,7 +29,7 @@ module Dry
   module Types
     extend Dry::Core::Extensions
     extend Dry::Core::ClassAttributes
-    extend Dry::Core::Deprecations[:'dry-types']
+    extend Dry::Core::Deprecations[:"dry-types"]
     include Dry::Core::Constants
 
     TYPE_SPEC_REGEX = /(.+)<(.+)>/.freeze

lib/dry/types/builder.rb

@@ -76,7 +76,7 @@ def default(input = Undefined, options = EMPTY_HASH, &block)
             " value every time. Call `.freeze` when setting the default"\
             " or pass `shared: true` to discard this warning."\
             "\n#{where}",
-            tag: :'dry-types'
+            tag: :"dry-types"
           )
         end
 
@@ -105,7 +105,7 @@ def enum(*values)
           if values.length == 1 && values[0].is_a?(::Hash)
             values[0]
           else
-            ::Hash[values.zip(values)]
+            values.zip(values).to_h
           end
 
         Enum.new(constrained(included_in: mapping.keys), mapping: mapping)
@@ -167,7 +167,7 @@ def fallback(value = Undefined, shared: false, &_fallback)
             " value every time. Call `.freeze` when setting the fallback"\
             " or pass `shared: true` to discard this warning."\
             "\n#{where}",
-            tag: :'dry-types'
+            tag: :"dry-types"
           )
         end
 

lib/dry/types/coercions/params.rb

@@ -12,9 +12,10 @@ module Coercions
       module Params
         TRUE_VALUES = %w[1 on On ON t true True TRUE T y yes Yes YES Y].freeze
         FALSE_VALUES = %w[0 off Off OFF f false False FALSE F n no No NO N].freeze
-        BOOLEAN_MAP = ::Hash[
-          TRUE_VALUES.product([true]) + FALSE_VALUES.product([false])
-        ].merge(true => true, false => false).freeze
+        BOOLEAN_MAP = EMPTY_HASH.merge(
+          [true, *TRUE_VALUES].to_h { |v| [v, true] },
+          [false, *FALSE_VALUES].to_h { |v| [v, false] }
+        ).freeze
 
         extend Coercions
 

lib/dry/types/compiler.rb

@@ -6,7 +6,7 @@ module Dry
   module Types
     # @api private
     class Compiler
-      extend ::Dry::Core::Deprecations[:'dry-types']
+      extend ::Dry::Core::Deprecations[:"dry-types"]
 
       attr_reader :registry
 

lib/dry/types/core.rb

@@ -60,7 +60,8 @@ module Types
 
     # Register {KERNEL_COERCIBLE} types
     KERNEL_COERCIBLE.each do |name, primitive|
-      register("coercible.#{name}", self["nominal.#{name}"].constructor(Kernel.method(primitive.name)))
+      register("coercible.#{name}",
+               self["nominal.#{name}"].constructor(Kernel.method(primitive.name)))
     end
 
     # Register {METHOD_COERCIBLE} types

lib/dry/types/lax.rb

@@ -68,7 +68,7 @@ def decorate?(response)
       end
     end
 
-    extend ::Dry::Core::Deprecations[:'dry-types']
+    extend ::Dry::Core::Deprecations[:"dry-types"]
     Safe = Lax
     deprecate_constant(:Safe)
   end

lib/dry/types/module.rb

@@ -29,7 +29,7 @@ def initialize(registry, *args, **kwargs)
           singleton_class.send(:define_method, :included) do |base|
             super(base)
             base.instance_exec(const_get(:Nominal, false)) do |nominal|
-              extend Dry::Core::Deprecations[:'dry-types']
+              extend Dry::Core::Deprecations[:"dry-types"]
               const_set(:Definition, nominal)
               deprecate_constant(:Definition, message: "Nominal")
             end

lib/dry/types/nominal.rb

@@ -199,7 +199,7 @@ def to_proc
       end
     end
 
-    extend Dry::Core::Deprecations[:'dry-types']
+    extend Dry::Core::Deprecations[:"dry-types"]
     Definition = Nominal
     deprecate_constant(:Definition, message: "Nominal")
   end

lib/dry/types/printer.rb

@@ -286,7 +286,7 @@ def visit_callable(callable)
         end
       end
 
-      def visit_options(options, meta = EMPTY_HASH)
+      def visit_options(options, meta = EMPTY_HASH) # rubocop:disable Metrics/PerceivedComplexity
         if options.empty? && meta.empty?
           yield ""
         else

lib/dry/types/schema.rb

@@ -92,7 +92,7 @@ def apply(hash, options = EMPTY_HASH)
       # @return [Object] if coercion fails and a block is given
       #
       # @api public
-      def try(input)
+      def try(input) # rubocop:disable Metrics/AbcSize
         if primitive?(input)
           success = true
           output = {}

lib/dry/types/schema/key.rb

@@ -15,7 +15,7 @@ class Schema < Hash
       #
       # @see Dry::Types::Schema
       class Key
-        extend ::Dry::Core::Deprecations[:'dry-types']
+        extend ::Dry::Core::Deprecations[:"dry-types"]
         include Type
         include Dry::Equalizer(:name, :type, :options, inspect: false, immutable: true)
         include Decorator

lib/dry/types/sum.rb

@@ -121,10 +121,10 @@ def success(input)
 
       # @api private
       def failure(input, _error = nil)
-        if !left.valid?(input)
-          left.failure(input, left.try(input).error)
-        else
+        if left.valid?(input)
           right.failure(input, right.try(input).error)
+        else
+          left.failure(input, left.try(input).error)
         end
       end
 

lib/dry/types/type.rb

@@ -8,7 +8,7 @@ module Types
     #
     # @api public
     module Type
-      extend ::Dry::Core::Deprecations[:'dry-types']
+      extend ::Dry::Core::Deprecations[:"dry-types"]
 
       deprecate(:safe, :lax)
 

spec/dry/types/predicate_inferrer_spec.rb

@@ -173,7 +173,7 @@ def type(*args)
       end
 
       it "should be removed once 2.0 is released" do
-        if Dry::Types::VERSION.start_with?('2.')
+        if Dry::Types::VERSION.start_with?("2.")
           raise "Remove infer_predicate_by_class_name"
         end
       end

spec/dry/types/sum_spec.rb

@@ -111,8 +111,7 @@
 
       expect { type.([%i[foo]]) }.to raise_error(Dry::Types::ConstraintError, /\[:foo\]/)
 
-      expect { type.([[1], [2]]) }.to raise_error(Dry::Types::ConstraintError, /[1]/)
-      expect { type.([[1], [2]]) }.to raise_error(Dry::Types::ConstraintError, /[2]/)
+      expect { type.([[1], [2]]) }.to raise_error(Dry::Types::ConstraintError, /2, \[1\]/)
     end
   end
 
@@ -155,7 +154,7 @@
 
     it "returns boolean" do
       expect(type.===("hello")).to eql(true)
-      expect(type.===(nil)).to eql(false)
+      expect(type.===(nil)).to eql(false) # rubocop:disable Style/NilComparison
     end
 
     context "in case statement" do