Construct Gem::Platform from cpu/os/version fields

Author: hsbt

lib/rubygems/yaml_serializer.rb

@@ -484,11 +484,7 @@ def build_version(node)
 
       def build_platform(node)
         hash = pairs_to_hash(node)
-        if hash["value"]
-          Gem::Platform.new(hash["value"])
-        else
-          Gem::Platform.new([hash["cpu"], hash["os"], hash["version"]])
-        end
+        Gem::Platform.new([hash["cpu"], hash["os"], hash["version"]])
       end
 
       def build_requirement(node)

test/rubygems/test_gem_safe_yaml.rb

@@ -933,14 +933,7 @@ def test_load_platform_from_value_field
     yaml = "!ruby/object:Gem::Platform\nvalue: x86-linux\n"
     plat = yaml_load(yaml, permitted_classes: Gem::SafeYAML::PERMITTED_CLASSES)
     assert_kind_of Gem::Platform, plat
-    if Gem.use_psych?
-      # Psych doesn't interpret the "value" field specially
-      assert_nil plat.cpu
-    else
-      # YAMLSerializer parses the "value" field as a platform string
-      assert_equal "x86", plat.cpu
-      assert_equal "linux", plat.os
-    end
+    assert_nil plat.cpu
   end
 
   def test_load_platform_from_cpu_os_version_fields