Merge pull request #573 from michael-lehew/master

Author: swift-ci

Foundation/NSKeyedUnarchiver.swift

@@ -112,12 +112,12 @@ open class NSKeyedUnarchiver : NSCoder {
 
         switch self._stream {
         case .data(let data):
-            try plist = PropertyListSerialization.propertyList(from: data, options: PropertyListSerialization.MutabilityOptions.immutable, format: &format)
+            try plist = PropertyListSerialization.propertyList(from: data, options: [], format: &format)
             break
         case .stream(let inputStream):
-            try plist = PropertyListSerialization.propertyListWithStream(unsafeBitCast(inputStream, to: CFReadStream.self),
+            try plist = PropertyListSerialization.propertyList(with: unsafeBitCast(inputStream, to: CFReadStream.self),
                                                                            length: 0,
-                                                                           options: PropertyListSerialization.MutabilityOptions.immutable,
+                                                                           options: [],
                                                                            format: &format)
             break
         }

Foundation/NSPropertyList.swift

@@ -20,8 +20,7 @@ extension PropertyListSerialization {
     public struct MutabilityOptions : OptionSet {
         public let rawValue : UInt
         public init(rawValue: UInt) { self.rawValue = rawValue }
-        
-        static let immutable = MutabilityOptions(rawValue: 0)
+
         static let mutableContainers = MutabilityOptions(rawValue: 1)
         static let mutableContainersAndLeaves = MutabilityOptions(rawValue: 2)
     }
@@ -87,7 +86,7 @@ open class PropertyListSerialization : NSObject {
         }
     }
 
-    internal class func propertyListWithStream(_ stream: CFReadStream, length streamLength: Int, options opt: ReadOptions, format: UnsafeMutablePointer <PropertyListFormat>?) throws -> Any {
+    internal class func propertyList(with stream: CFReadStream, length streamLength: Int, options opt: ReadOptions, format: UnsafeMutablePointer <PropertyListFormat>?) throws -> Any {
         var fmt = kCFPropertyListBinaryFormat_v1_0
         var error: Unmanaged<CFError>? = nil
         let decoded = withUnsafeMutablePointer(to: &fmt) { (outFmt: UnsafeMutablePointer<CFPropertyListFormat>) -> NSObject? in