persistent-dmnd 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b879b9c77d3a45c968c749d87e6c55122a80a79ed5663e6654395459288ca91
-  data.tar.gz: d2a79f2aeb43dffaddff8b984e1ebb020375b76f6a626206e8625543ea5c2ba3
+  metadata.gz: 941854bf9185d3078b878c25f4888315c2c29f0b823f453d10a44a89f733d7c4
+  data.tar.gz: cbb85dd3e9251e9800f00223c1a3a0ffc6764023593a0791e0289f94c431e1d0
 SHA512:
-  metadata.gz: d3f3ff75d7339f563f33f3e532bdf21e7ec126f8bf6024a62b99c1743ae7710187293a82b560cbf6cd34ae26181312d31a36214fa65ce24049bb31bdee4f758d
-  data.tar.gz: 6f136975f55d67f33662363931c000e0cb30f6e28da2cd5956eb6bf641d8b6bc9e53ea3d22bcc1fa20627499cc90ec1e8663e19beb615c788b7dc5723c8ca008
+  metadata.gz: efa93ab8dd9c78d2f65cc736cf4001e3631ab546ce19dec796843611191e152c6198d9c71aaf2c6b4bfe69d17bd942d12da2612c141af077d8abc4165c4a99ec
+  data.tar.gz: 3e43b4f670e76b820bbf48d7115a14cfbe29ef7ddb94702df4e981a773946398d1f4d6b271cc35cb838f136b5e4f2dd15a6490498a3e2207e70b02defd1dfa14

data/.gitlab-ci.yml

@@ -10,8 +10,9 @@ testruby_1_9_3:
       - vendor/ruby
 
   before_script:
-    - printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
-    - apt-get update >/dev/null                 # Add UTF-8 support
+    - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA8E81B4331F7F50 7638D0442B90D010 8B48AD6246925553
+    - echo "deb [trusted=yes] http://archive.debian.org/debian/ jessie main contrib non-free" | tee /etc/apt/sources.list
+    - apt-get update                            # Add UTF-8 support
     - apt-get install -y locales >/dev/null     # |
     - echo "en_US UTF-8" > /etc/locale.gen      # |
     - locale-gen en_US.UTF-8                    # |
@@ -34,8 +35,9 @@ testruby_2_0:
       - vendor/ruby
 
   before_script:
-    - printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
-    - apt-get update >/dev/null                 # Add UTF-8 support
+    - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA8E81B4331F7F50 7638D0442B90D010 8B48AD6246925553
+    - echo "deb [trusted=yes] http://archive.debian.org/debian/ jessie main contrib non-free" | tee /etc/apt/sources.list
+    - apt-get update                            # Add UTF-8 support
     - apt-get install -y locales >/dev/null     # |
     - echo "en_US UTF-8" > /etc/locale.gen      # |
     - locale-gen en_US.UTF-8                    # |
@@ -233,6 +235,50 @@ testruby_3_0:
   script:
     - bin/rspec
 
+testruby_3_1:
+  image: "ruby:3.1.0"
+
+  # Cache gems in between builds
+  cache:
+    paths:
+      - vendor/ruby
+
+  before_script:
+    - apt-get update >/dev/null                 # Add UTF-8 support
+    - apt-get install -y locales >/dev/null     # |
+    - echo "en_US UTF-8" > /etc/locale.gen      # |
+    - locale-gen en_US.UTF-8                    # |
+    - export LANG=en_US.UTF-8                   # |
+    - export LANGUAGE=en_US:en                  # |
+    - export LC_ALL=en_US.UTF-8                 # v
+    - ruby -v                                   # Print out ruby version for debugging
+    - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
+
+  script:
+    - bin/rspec
+
+testruby_3_2:
+  image: "ruby:3.2.0"
+
+  # Cache gems in between builds
+  cache:
+    paths:
+      - vendor/ruby
+
+  before_script:
+    - apt-get update >/dev/null                 # Add UTF-8 support
+    - apt-get install -y locales >/dev/null     # |
+    - echo "en_US UTF-8" > /etc/locale.gen      # |
+    - locale-gen en_US.UTF-8                    # |
+    - export LANG=en_US.UTF-8                   # |
+    - export LANGUAGE=en_US:en                  # |
+    - export LC_ALL=en_US.UTF-8                 # v
+    - ruby -v                                   # Print out ruby version for debugging
+    - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
+
+  script:
+    - bin/rspec
+
 testjruby_1_7:
   image: "jruby:1.7"
 
@@ -268,6 +314,8 @@ testjruby_9_0:
 
   before_script:
     - rm /etc/apt/sources.list.d/jessie-backports.list
+    - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA8E81B4331F7F50 7638D0442B90D010 8B48AD6246925553
+    - echo "deb [trusted=yes] http://archive.debian.org/debian/ jessie main contrib non-free" | tee /etc/apt/sources.list
     - apt-get update                            # Add UTF-8 support
     - apt-get install -y locales >/dev/null     # |
     - echo "en_US UTF-8" > /etc/locale.gen      # |
@@ -313,8 +361,10 @@ testjruby_9_1:
   script:
     - bin/rspec
 
-testjruby_9_1:
-  image: "jruby:9.1"
+# This is not repeated from the 9.2 below! 9.2.0.0 is a very specific version with a bug in the Set interoperability so
+# we'll want to check that our workaround is working with this one even after the 9.2 branch moves on.
+testjruby9_2_0_0:
+  image: "jruby:9.2.0.0"
 
   # Cache gems in between builds
   cache:
@@ -332,17 +382,14 @@ testjruby_9_1:
     - apt-get install -y git >/dev/null         # Add git binary
     - export JRUBY_OPTS=--dev                   # Faster test runs
     - ruby -v                                   # Print out ruby version for debugging
-    - gem uninstall -x -i /opt/jruby/lib/ruby/gems/shared bundler # Remove any pre-existing bundler
     - gem install bundler:'< 2'                 # Bundler is not installed with the image
     - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
 
   script:
     - bin/rspec
 
-# This is not repeated from the 9.2 below! 9.2.0.0 is a very specific version with a bug in the Set interoperability so
-# we'll want to check that our workaround is working with this one even after the 9.2 branch moves on.
-testjruby9_2_0_0:
-  image: "jruby:9.2.0.0"
+testjruby_9_2:
+  image: "jruby:9.2"
 
   # Cache gems in between builds
   cache:
@@ -360,14 +407,15 @@ testjruby9_2_0_0:
     - apt-get install -y git >/dev/null         # Add git binary
     - export JRUBY_OPTS=--dev                   # Faster test runs
     - ruby -v                                   # Print out ruby version for debugging
+    - gem uninstall -a -x -i /opt/jruby/lib/ruby/gems/shared bundler # Remove any pre-existing bundler
     - gem install bundler:'< 2'                 # Bundler is not installed with the image
     - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
 
   script:
     - bin/rspec
 
-testjruby_9_2:
-  image: "jruby:9.2"
+testjruby_9_3:
+  image: "jruby:9.3"
 
   # Cache gems in between builds
   cache:
@@ -385,18 +433,58 @@ testjruby_9_2:
     - apt-get install -y git >/dev/null         # Add git binary
     - export JRUBY_OPTS=--dev                   # Faster test runs
     - ruby -v                                   # Print out ruby version for debugging
-    - gem uninstall -a -x -i /opt/jruby/lib/ruby/gems/shared bundler # Remove any pre-existing bundler
-    - gem install bundler:'< 2'                 # Bundler is not installed with the image
     - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
 
   script:
     - bin/rspec
 
-testtruffleruby:
-  image: "danny02/graalvm"
+testjruby_9_4:
+  image: "jruby:9.4"
+
+  # Cache gems in between builds
+  cache:
+    paths:
+      - vendor/ruby
+
+  before_script:
+    - apt-get update >/dev/null                 # Add UTF-8 support
+    - apt-get install -y locales >/dev/null     # |
+    - echo "en_US UTF-8" > /etc/locale.gen      # |
+    - locale-gen en_US.UTF-8                    # |
+    - export LANG=en_US.UTF-8                   # |
+    - export LANGUAGE=en_US:en                  # |
+    - export LC_ALL=en_US.UTF-8                 # v
+    - apt-get install -y git >/dev/null         # Add git binary
+    - export JRUBY_OPTS=--dev                   # Faster test runs
+    - ruby -v                                   # Print out ruby version for debugging
+    - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
+
+  script:
+    - bin/rspec
+
+testtruffleruby_20_2_0:
+  image: "flavorjones/truffleruby:20.2.0-buster"
+
+  before_script:
+    - apt-get update >/dev/null                 # Add UTF-8 support
+    - apt-get install -y locales >/dev/null     # |
+    - echo "en_US UTF-8" > /etc/locale.gen      # |
+    - locale-gen en_US.UTF-8                    # |
+    - export LANG=en_US.UTF-8                   # |
+    - export LANGUAGE=en_US:en                  # |
+    - export LC_ALL=en_US.UTF-8                 # v
+    - apt-get install -y git >/dev/null         # Add git binary
+    - ruby -v                                   # Print out ruby version for debugging
+    - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
+
+  script:
+    - bin/rspec
+
+
+testtruffleruby_21_3_0:
+  image: "ghcr.io/flavorjones/truffleruby:21.3.0"
 
   before_script:
-    - gu install -c org.graalvm.ruby            # Install TruffleRuby
     - apt-get update >/dev/null                 # Add UTF-8 support
     - apt-get install -y locales >/dev/null     # |
     - echo "en_US UTF-8" > /etc/locale.gen      # |
@@ -404,11 +492,9 @@ testtruffleruby:
     - export LANG=en_US.UTF-8                   # |
     - export LANGUAGE=en_US:en                  # |
     - export LC_ALL=en_US.UTF-8                 # v
-    - apt-get install -y git libssl-dev libssl1.1 clang llvm make >/dev/null # Add git binary + truffleruby dependencies
-    - /graalvm*/jre/languages/ruby/lib/truffle/post_install_hook.sh # Rebuild openssl extension, as suggested by install
-                                                                    # notes
+    - apt-get install -y git >/dev/null         # Add git binary
     - ruby -v                                   # Print out ruby version for debugging
-    - bundle install -j $(nproc)                # Install dependencies
+    - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
 
   script:
     - bin/rspec

data/.ruby-version

@@ -1 +1 @@
-ruby-3.0.0
+ruby-3.0.2

data/CODE_OF_CONDUCT.adoc

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 == Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at ivo.anjo@ist.utl.pt. All
+reported by contacting the project team at ivo@ivoanjo.me. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Ivo Anjo
+Copyright (c) 2017-2021 Ivo Anjo
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.adoc

@@ -97,7 +97,7 @@ It also (_optionally!_) interoperates with the https://github.com/ruby-concurren
 Underneath the covers, persistent-💎 mostly builds atop the awesome https://github.com/hamstergem/hamster[hamster gem].
 Big thanks to its equally-awesome authors!
 
-Persistent-💎 is fully supported and tested on Ruby versions 1.9.3 to 3.0.0, JRuby 1.7 to 9.2, and TruffleRuby 1.0+ 🎉.
+Persistent-💎 is fully supported and tested on Ruby versions 1.9.3 to 3.2, JRuby 1.7 to 9.4, and TruffleRuby 🎉.
 If we don't support your Ruby, it's probably a Python binary instead (or a potato?).
 Keep calm and 💎 away!
 

data/gems.rb

@@ -1,11 +1,11 @@
 # encoding: UTF-8
 # typed: false
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
 # Specify ffi version to avoid dependency issues when switching between MRI
 # and JRuby with the same gems.lock
 # Only used in development
-gem 'ffi', '~> 1.9.18'
+gem "ffi", "~> 1.9.18"

data/lib/persistent-dmnd.rb

@@ -2,13 +2,13 @@
 # typed: strong
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎.
 #
 # MIT License
 #
-# Copyright (c) 2017 Ivo Anjo
+# Copyright (c) 2017-2021 Ivo Anjo
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,4 +30,4 @@
 
 # frozen_string_literal: true
 
-require 'persistent-💎'
+require "persistent-💎"

data/lib/persistent-/360/237/222/216.rb

@@ -2,13 +2,13 @@
 # typed: true
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎.
 #
 # MIT License
 #
-# Copyright (c) 2017 Ivo Anjo
+# Copyright (c) 2017-2021 Ivo Anjo
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,12 +30,12 @@
 
 # frozen_string_literal: true
 
-require 'persistent_dmnd/version'
-require 'persistent_dmnd/array'
-require 'persistent_dmnd/hash'
-require 'persistent_dmnd/set'
-require 'persistent_dmnd/dmndifier'
-require 'persistent_dmnd/jruby_workaround'
+require "persistent_dmnd/version"
+require "persistent_dmnd/array"
+require "persistent_dmnd/hash"
+require "persistent_dmnd/set"
+require "persistent_dmnd/dmndifier"
+require "persistent_dmnd/jruby_workaround"
 
 module Persistent💎
   include JRubyWorkaround

data/lib/persistent_dmnd/array.rb

@@ -2,13 +2,13 @@
 # typed: false
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎.
 #
 # MIT License
 #
-# Copyright (c) 2017 Ivo Anjo
+# Copyright (c) 2017-2021 Ivo Anjo
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,13 +30,13 @@
 
 # frozen_string_literal: true
 
-require 'persistent_dmnd/self_conversion'
-require 'persistent_dmnd/is_persistent'
-require 'persistent_dmnd/concurrent_ruby_support'
-require 'persistent_dmnd/jruby_workaround'
+require "persistent_dmnd/self_conversion"
+require "persistent_dmnd/is_persistent"
+require "persistent_dmnd/concurrent_ruby_support"
+require "persistent_dmnd/jruby_workaround"
 
-require 'hamster'
-require 'set'
+require "hamster"
+require "set"
 
 module Persistent💎
   class Array < Hamster::Vector

data/lib/persistent_dmnd/concurrent_ruby_support.rb

@@ -2,13 +2,13 @@
 # typed: true
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎.
 #
 # MIT License
 #
-# Copyright (c) 2017 Ivo Anjo
+# Copyright (c) 2017-2021 Ivo Anjo
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,7 @@
 
 # frozen_string_literal: true
 
-require 'thread'
+require "thread"
 
 module Persistent💎
   # Simple module that attempts to load concurrent-ruby, and then stores the result for quick lookup
@@ -52,7 +52,7 @@ module Persistent💎
 
         begin
           REQUIRE_MUTEX.synchronize do # Avoid require races
-            require 'concurrent'
+            require "concurrent"
           end
           mark_as_success
           true
@@ -66,7 +66,7 @@ module Persistent💎
 
       def raise_no_concurrent_ruby
         raise(NotImplementedError,
-              'concurrent-ruby gem is not available, please install it in order to use #to_concurrent and #to_concurrent_* methods')
+              "concurrent-ruby gem is not available, please install it in order to use #to_concurrent and #to_concurrent_* methods")
       end
 
       # The following methods are only for internal and test usage. Please do not use them :)

data/lib/persistent_dmnd/dmndifier.rb

@@ -2,13 +2,13 @@
 # typed: true
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎.
 #
 # MIT License
 #
-# Copyright (c) 2017 Ivo Anjo
+# Copyright (c) 2017-2021 Ivo Anjo
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,9 +30,9 @@
 
 # frozen_string_literal: true
 
-require 'persistent_dmnd/ruby_1_9_and_2_0_support'
+require "persistent_dmnd/ruby_1_9_and_2_0_support"
 
-require 'hamster'
+require "hamster"
 
 module Persistent💎
   class Dmndifier

data/lib/persistent_dmnd/everywhere.rb

@@ -1,14 +1,13 @@
 # encoding: UTF-8
-# typed: ignore
-
+# typed: strict
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎.
 #
 # MIT License
 #
-# Copyright (c) 2017 Ivo Anjo
+# Copyright (c) 2017-2021 Ivo Anjo
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +29,7 @@
 
 # frozen_string_literal: true
 
-require 'persistent-💎'
+require "persistent-💎"
 
 # Add our module to the main object, allowing our syntax to be used everywhere
 include Persistent💎

data/lib/persistent_dmnd/hash.rb

@@ -2,13 +2,13 @@
 # typed: false
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎.
 #
 # MIT License
 #
-# Copyright (c) 2017 Ivo Anjo
+# Copyright (c) 2017-2021 Ivo Anjo
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,13 +30,13 @@
 
 # frozen_string_literal: true
 
-require 'persistent_dmnd/self_conversion'
-require 'persistent_dmnd/is_persistent'
-require 'persistent_dmnd/concurrent_ruby_support'
-require 'persistent_dmnd/jruby_workaround'
+require "persistent_dmnd/self_conversion"
+require "persistent_dmnd/is_persistent"
+require "persistent_dmnd/concurrent_ruby_support"
+require "persistent_dmnd/jruby_workaround"
 
-require 'hamster'
-require 'set'
+require "hamster"
+require "set"
 
 module Persistent💎
   class Hash < Hamster::Hash

data/lib/persistent_dmnd/is_persistent.rb

@@ -2,13 +2,13 @@
 # typed: true
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎.
 #
 # MIT License
 #
-# Copyright (c) 2017 Ivo Anjo
+# Copyright (c) 2017-2021 Ivo Anjo
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/persistent_dmnd/jruby_9_2_set_workaround.rb

@@ -2,7 +2,7 @@
 # typed: false
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017-2018 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎, and parts were inspired by Ruby's set.rb
 # https://github.com/ruby/ruby/blob/v2_6_0_preview2/lib/set.rb
@@ -12,7 +12,7 @@
 
 # frozen_string_literal: true
 
-require 'set'
+require "set"
 
 module Persistent💎
   # Workaround for https://github.com/jruby/jruby/issues/5227
@@ -43,7 +43,7 @@ module Persistent💎
       end
     end
 
-    if RUBY_PLATFORM == 'java' && JRUBY_VERSION.start_with?('9.2.') && workaround_needed?
+    if RUBY_PLATFORM == "java" && (JRUBY_VERSION.start_with?("9.2.") || JRUBY_VERSION.start_with?("9.3.") || JRUBY_VERSION.start_with?("9.4.")) && workaround_needed?
       class ::Set
         # Save existing Set methods
 
@@ -57,9 +57,24 @@ module Persistent💎
         alias persistent_dmnd_workaround_original_flatten_merge flatten_merge
         alias persistent_dmnd_workaround_original_flatten flatten
         alias persistent_dmnd_workaround_original_flatten! flatten!
+        alias persistend_dmnd_workaround_original_spaceship <=>
 
         # Redefine all set methods that use instanceof RubySet to restore previous behavior
 
+        if JRUBY_VERSION.start_with?("9.4.")
+          def <=>(set)
+            original = persistend_dmnd_workaround_original_spaceship(set)
+            return original if original
+
+            return unless set.is_a?(::Set)
+            case size <=> set.size
+            when -1 then -1 if proper_subset?(set)
+            when +1 then +1 if proper_superset?(set)
+            else 0 if self.==(set)
+            end
+          end
+        end
+
         def ==(other)
           persistent_dmnd_workaround_original_equal(other) ||
             (other.is_a?(::Set) && size == other.size && other.all? { |o| include?(o) })
@@ -108,13 +123,11 @@ module Persistent💎
           persistent_dmnd_workaround_original_disjoint?(set)
         rescue ArgumentError => e
           raise unless e.message == "value must be a set" && set.is_a?(::Set)
-          !(
-            if size < set.size
-              any? { |o| set.include?(o) }
-            else
-              set.any? { |o| include?(o) }
-            end
-          )
+          !(if size < set.size
+            any? { |o| set.include?(o) }
+          else
+            set.any? { |o| include?(o) }
+          end)
         end
 
         def flatten_merge(set, seen = ::Set.new)

data/lib/persistent_dmnd/jruby_workaround.rb

@@ -2,13 +2,13 @@
 # typed: false
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎.
 #
 # MIT License
 #
-# Copyright (c) 2017 Ivo Anjo
+# Copyright (c) 2017-2021 Ivo Anjo
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -32,11 +32,11 @@
 
 module Persistent💎
   module JRubyWorkaround
-    if RUBY_PLATFORM == 'java' && JRUBY_VERSION < "9.2.0.0" # Only supposed to do something on legacy JRuby versions
+    if RUBY_PLATFORM == "java" && JRUBY_VERSION < "9.2.0.0" # Only supposed to do something on legacy JRuby versions
       BROKEN_ENCODING = "\x00"
       private_constant :BROKEN_ENCODING
 
-      BROKEN_ENCODING_JRUBY_1_7 = [239, 146, 142].pack('c*').force_encoding('UTF-8')
+      BROKEN_ENCODING_JRUBY_1_7 = [239, 146, 142].pack("c*").force_encoding("UTF-8")
       private_constant :BROKEN_ENCODING_JRUBY_1_7
 
       def self.included(klass)
@@ -81,25 +81,25 @@ module Persistent💎
       def maybe_fix_broken_encoding(name, target = nil)
         name_string = name.to_s
 
-        if JRUBY_VERSION.start_with?('1.7.')
+        if JRUBY_VERSION.start_with?("1.7.")
           unless name_string.match(/\?.+/) ||
-                 ['a?', 'h?', 's?', 'each?'].include?(name_string) ||
-                 ['_?', '_a?', '_h?', '_s?'].any? { |suffix| name_string.end_with?(suffix) }
+                 ["a?", "h?", "s?", "each?"].include?(name_string) ||
+                 ["_?", "_a?", "_h?", "_s?"].any? { |suffix| name_string.end_with?(suffix) }
             return
           end
         else
           return unless name_string.end_with?(BROKEN_ENCODING)
         end
 
-        fixed_name = name_string.sub('?', '💎').delete(BROKEN_ENCODING).to_sym
-        fixed_name_jruby_1_7 = name_string.sub('?', BROKEN_ENCODING_JRUBY_1_7).to_sym
+        fixed_name = name_string.sub("?", "💎").delete(BROKEN_ENCODING).to_sym
+        fixed_name_jruby_1_7 = name_string.sub("?", BROKEN_ENCODING_JRUBY_1_7).to_sym
 
         if target
           target.instance_eval { alias_method(fixed_name, name) }
-          target.instance_eval { alias_method(fixed_name_jruby_1_7, name) } if JRUBY_VERSION.start_with?('1.7.')
+          target.instance_eval { alias_method(fixed_name_jruby_1_7, name) } if JRUBY_VERSION.start_with?("1.7.")
         else
           alias_method(fixed_name, name)
-          alias_method(fixed_name_jruby_1_7, name) if JRUBY_VERSION.start_with?('1.7.')
+          alias_method(fixed_name_jruby_1_7, name) if JRUBY_VERSION.start_with?("1.7.")
         end
       end
     end