Target 3.1+ syntax

.rubocop.yml

@@ -1,7 +1,7 @@
 # This is a config synced from dry-rb/template-gem repo
 
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
   NewCops: disable
   SuggestExtensions: false
   Exclude:

lib/dry/initializer/config.rb

@@ -140,11 +140,11 @@ def initialize(extended_class = nil, null: UNDEFINED)
       def add_definition(option, name, type, block, **opts)
         opts = {
           parent: extended_class,
-          option: option,
-          null: null,
+          option:,
+          null:,
           source: name,
-          type: type,
-          block: block,
+          type:,
+          block:,
           **opts
         }
 

lib/dry/initializer/definition.rb

@@ -18,11 +18,11 @@ class Definition
       def options
         {
           as: target,
-          type: type,
-          optional: optional,
-          default: default,
-          reader: reader,
-          desc: desc
+          type:,
+          optional:,
+          default:,
+          reader:,
+          desc:
         }.compact
       end
 

lib/dry/initializer/dispatchers.rb

@@ -88,7 +88,7 @@ def <<(dispatcher)
       # @return [Hash<Symbol, Objct>] normalized set of options
       #
       def call(**options)
-        options = {null: null, **options}
+        options = {null:, **options}
         pipeline.reduce(options) { |opts, dispatcher| dispatcher.call(**opts) }
       end
 

lib/dry/initializer/dispatchers/build_nested_type.rb

@@ -19,7 +19,7 @@ def call(parent:, source:, target:, type: nil, block: nil, **options)
           check_certainty!(source, type, block)
           check_name!(target, block)
           type ||= build_nested_type(parent, target, block)
-          {parent: parent, source: source, target: target, type: type, **options}
+          {parent:, source:, target:, type:, **options}
         end
         # rubocop: enable Metrics/ParameterLists
 

lib/dry/initializer/dispatchers/check_type.rb

@@ -12,7 +12,7 @@ def call(source:, type: nil, wrap: 0, **options)
           check_if_callable! source, type
           check_arity! source, type, wrap
 
-          {source: source, type: type, wrap: wrap, **options}
+          {source:, type:, wrap:, **options}
         end
 
         private

lib/dry/initializer/dispatchers/prepare_default.rb

@@ -14,7 +14,7 @@ def call(default: nil, optional: nil, **options)
           default = callable! default
           check_arity! default
 
-          {default: default, optional: (optional | default), **options}
+          {default:, optional: (optional | default), **options}
         end
 
         private

lib/dry/initializer/dispatchers/prepare_ivar.rb

@@ -11,7 +11,7 @@ module PrepareIvar
         def call(target:, **options)
           ivar = "@#{target}".delete("?").to_sym
 
-          {target: target, ivar: ivar, **options}
+          {target:, ivar:, **options}
         end
       end
     end

lib/dry/initializer/dispatchers/prepare_optional.rb

@@ -12,7 +12,7 @@ def call(optional: nil, default: nil, required: nil, **options)
           optional ||= default
           optional &&= !required
 
-          {optional: !!optional, default: default, **options}
+          {optional: !!optional, default:, **options}
         end
       end
     end

lib/dry/initializer/dispatchers/prepare_reader.rb

@@ -16,7 +16,7 @@ def call(target: nil, reader: :public, **options)
                    else invalid_reader!(target, reader)
                    end
 
-          {target: target, reader: reader, **options}
+          {target:, reader:, **options}
         end
 
         private

lib/dry/initializer/dispatchers/prepare_target.rb

@@ -27,7 +27,7 @@ def call(source:, target: nil, as: nil, **options)
           check_ruby_name!(target)
           check_reserved_names!(target)
 
-          {source: source, target: target, **options}
+          {source:, target:, **options}
         end
 
         private

lib/dry/initializer/dispatchers/unwrap_type.rb

@@ -15,7 +15,7 @@ module UnwrapType
         def call(type: nil, wrap: 0, **options)
           type, count = unwrap(type, wrap)
 
-          {type: type, wrap: count, **options}
+          {type:, wrap: count, **options}
         end
 
         private

lib/dry/initializer/dsl.rb

@@ -25,7 +25,7 @@ def [](undefined: true, **)
       # @return [Module]
       # @yield proc defining params and options
       def define(procedure = nil, &block)
-        config = Config.new(null: null)
+        config = Config.new(null:)
         config.instance_exec(&procedure || block)
         config.mixin.include Mixin::Root
         config.mixin
@@ -34,7 +34,7 @@ def define(procedure = nil, &block)
       private
 
       def extended(klass)
-        config = Config.new(klass, null: null)
+        config = Config.new(klass, null:)
         klass.send :instance_variable_set, :@dry_initializer, config
         klass.include Mixin::Root
       end