commit 3b1ebdba82b3779c7d2f3dba24134a00cd82cd48
author swift-ci <swift-ci@users.noreply.github.com> Tue Jul 11 09:51:02 2017 -0700
committer GitHub <noreply@github.com> Tue Jul 11 09:51:02 2017 -0700
tree 2e1e48af39742846f0559613af7e25bc0644b481
parent 8602d9a1ca63aa9cdedc51f0141d47b24ec1ab3d
parent 0270e5646614bf8a55f49bdfcd8bc56420fac3c8

Merge pull request #1111 from pushkarnk/improve-descriptions

Foundation/NSJSONSerialization.swift

diff --git a/Foundation/NSJSONSerialization.swift b/Foundation/NSJSONSerialization.swift
index 6bbf91c..13e639e 100644
--- a/Foundation/NSJSONSerialization.swift
+++ b/Foundation/NSJSONSerialization.swift
@@ -533,7 +533,7 @@
                 }
                 let options: NSString.CompareOptions = [.numeric, .caseInsensitive, .forcedOrdering]
                 let range: Range<String.Index>  = a.startIndex..<a.endIndex
-                let locale = NSLocale.systemLocale()
+                let locale = NSLocale.system
 
                 return a.compare(b, options: options, range: range, locale: locale) == .orderedAscending
             })

Foundation/NSLocale.swift

diff --git a/Foundation/NSLocale.swift b/Foundation/NSLocale.swift
index 266f377..4b1b44f 100644
--- a/Foundation/NSLocale.swift
+++ b/Foundation/NSLocale.swift
@@ -84,7 +84,7 @@
         return CFLocaleCopyCurrent()._swiftObject
     }
     
-    open class func systemLocale() -> Locale {
+    open class var system: Locale {
         return CFLocaleGetSystem()._swiftObject
     }
 }