Skip to content

Commit 8ab4cdf

Browse files
committed
♻️ Set Config[:default] as alias of Config[VERSION]
The docs already claimed that `:default` was an alias for `:current`. But, although they were equal to each other, they were not the same object. Now they are one and the same. This also fixes a minor inconsistency in `Config#inspect`, because `Config[:default].named_default?` (incorrectly) returned `false`.
1 parent 59e49bb commit 8ab4cdf

2 files changed

Lines changed: 1 addition & 5 deletions

File tree

lib/net/imap/config.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,6 @@ def name
578578
if equal? Config.default then "#{Config}.default"
579579
elsif equal? Config.global then "#{Config}.global"
580580
elsif equal? Config[0.0r] then "#{Config}[:original]"
581-
elsif equal? Config[:default] then "#{Config}[:default]"
582581
elsif (v = AttrVersionDefaults::VERSIONS.find { equal? Config[_1] })
583582
"%s[%0.1f]" % [Config, v]
584583
else

lib/net/imap/config/attr_version_defaults.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ def self.compile_default!
5959
end
6060

6161
def self.compile_version_defaults!
62-
# Temporarily assign Config.default, enabling #load_defaults(:default)
63-
version_defaults[:default] = Config.default
64-
# Use #load_defaults so some attributes are inherited from global.
65-
version_defaults[:default] = Config.new.load_defaults(:default).freeze
6662
version_defaults[0.0r] = Config[version_defaults.fetch(0.0r)]
6763

6864
VERSIONS.each_cons(2) do |prior, version|
@@ -81,6 +77,7 @@ def self.compile_version_defaults!
8177

8278
version_defaults[:original] = Config[0.0r]
8379
version_defaults[:current] = Config[CURRENT_VERSION]
80+
version_defaults[:default] = Config[CURRENT_VERSION]
8481
version_defaults[:next] = Config[NEXT_VERSION]
8582
version_defaults[:future] = Config[FUTURE_VERSION]
8683

0 commit comments

Comments
 (0)