Revert MatchPlatform#platforms_match?

Because some examples are failed:

    rspec ./spec/cache/gems_spec.rb:236 # bundle cache when previously cached doesn't remove gems that are for another platform
    rspec ./spec/commands/install_spec.rb:220 # bundle install with gem sources the simple case with a gem that installs multiple platforms installs gems for the local platform as first choice
    rspec ./spec/commands/update_spec.rb:39 # bundle update with --all updates the entire bundle
    rspec ./spec/commands/update_spec.rb:49 # bundle update with --all doesn't delete the Gemfile.lock file if something goes wrong
    rspec ./spec/commands/update_spec.rb:104 # bundle update with a top level dependency unlocks all child dependencies that are unrelated to other locked dependencies
    rspec ./spec/commands/update_spec.rb:115 # bundle update with an unknown dependency should inform the user
    rspec ./spec/commands/update_spec.rb:119 # bundle update with an unknown dependency should suggest alternatives
    rspec ./spec/commands/update_spec.rb:126 # bundle update with a child dependency should update the child dependency
    rspec ./spec/commands/update_spec.rb:299 # bundle update in a frozen bundle should suggest different command when frozen is set globally
    rspec ./spec/runtime/platform_spec.rb:60 # Bundler.setup with multi platform stuff will add the resolve for the current platform

2 files changed, 9 insertions, 10 deletions

diff --git a/lib/bundler/match_platform.rb b/lib/bundler/match_platform.rb
index 81d85d8e46..69074925a6 100644
--- a/lib/bundler/match_platform.rb
+++ b/lib/bundler/match_platform.rb
@@ -15,10 +15,7 @@ module Bundler
       return true if Gem::Platform::RUBY == gemspec_platform
       return true if local_platform == gemspec_platform
       gemspec_platform = Gem::Platform.new(gemspec_platform)
-      generic_gemspec_platform = GemHelpers.generic(gemspec_platform)
-      unless generic_gemspec_platform == Gem::Platform::RUBY
-        return true if generic_gemspec_platform === local_platform
-      end
+      return true if GemHelpers.generic(gemspec_platform) === local_platform
       return true if gemspec_platform === local_platform
 
       false
diff --git a/spec/install/gems/resolving_spec.rb b/spec/install/gems/resolving_spec.rb
index 1c7554700a..2f46661058 100644
--- a/spec/install/gems/resolving_spec.rb
+++ b/spec/install/gems/resolving_spec.rb
@@ -150,17 +150,19 @@ RSpec.describe "bundle install with install-time dependencies" do
             s.required_ruby_version = "> 9000"
           end
           build_gem "rack", "1.2" do |s|
-            s.platform = Bundler.local_platform
+            s.platform = mingw
             s.required_ruby_version = "> 9000"
           end
           build_gem "rack", "1.2"
         end
 
-        install_gemfile <<-G, :artifice => "compact_index_rate_limited", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
-          ruby "#{RUBY_VERSION}"
-          source "http://localgemserver.test/"
-          gem 'rack'
-        G
+        simulate_platform mingw do
+          install_gemfile <<-G, :artifice => "compact_index_rate_limited", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+            ruby "#{RUBY_VERSION}"
+            source "http://localgemserver.test/"
+            gem 'rack'
+          G
+        end
 
         expect(out).to_not include("rack-9001.0.0 requires ruby version > 9000")
         expect(out).to_not include("rack-1.2-#{Bundler.local_platform} requires ruby version > 9000")