Merge branch 'swift-4.0-branch-06-23-2017' into infer-downgrade-exhaustivity-check-4.0b3

Author: DougGregor

lib/Migrator/APIDiffMigratorPass.cpp

@@ -12,6 +12,7 @@
 
 #include "swift/AST/USRGeneration.h"
 #include "swift/AST/ASTVisitor.h"
+#include "swift/Basic/StringExtras.h"
 #include "swift/Frontend/Frontend.h"
 #include "swift/IDE/Utils.h"
 #include "swift/Index/Utils.h"
@@ -611,8 +612,12 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
                                           Arg->getStartLoc().getAdvancedLoc(1));
 
           // Replace "x.getY(" with "x.Y =".
-          Editor.replace(ReplaceRange, (llvm::Twine(Walker.Result.str().
-                                                   substr(3)) + " = ").str());
+          auto Replacement = (llvm::Twine(Walker.Result.str()
+                                          .substr(3)) + " = ").str();
+          SmallString<64> Scratch;
+          Editor.replace(ReplaceRange,
+                         camel_case::toLowercaseInitialisms(Replacement, Scratch));
+
           // Remove ")"
           Editor.remove(CharSourceRange(SM, Arg->getEndLoc(), Arg->getEndLoc().
                                         getAdvancedLoc(1)));

stdlib/public/SDK/Dispatch/Source.swift

@@ -114,18 +114,30 @@ extension DispatchWallTime {
   }
 }
 
-public enum DispatchTimeInterval {
+public enum DispatchTimeInterval : Equatable {
 	case seconds(Int)
 	case milliseconds(Int)
 	case microseconds(Int)
 	case nanoseconds(Int)
+	@_downgrade_exhaustivity_check
+	case never
 
 	internal var rawValue: Int64 {
 		switch self {
 		case .seconds(let s): return Int64(s) * Int64(NSEC_PER_SEC)
 		case .milliseconds(let ms): return Int64(ms) * Int64(NSEC_PER_MSEC)
 		case .microseconds(let us): return Int64(us) * Int64(NSEC_PER_USEC)
 		case .nanoseconds(let ns): return Int64(ns)
+		case .never: return Int64.max
+		}
+	}
+
+	public static func ==(lhs: DispatchTimeInterval, rhs: DispatchTimeInterval) -> Bool {
+		switch (lhs, rhs) {
+		case (.never, .never): return true
+		case (.never, _): return false
+		case (_, .never): return false
+		default: return lhs.rawValue == rhs.rawValue
 		}
 	}
 }

stdlib/public/SDK/Dispatch/Time.swift

@@ -127,6 +127,17 @@
     "RightComment": "",
     "ModuleName": "bar"
   },
+  {
+    "DiffItemKind": "CommonDiffItem",
+    "NodeKind": "Function",
+    "NodeAnnotation": "SetterToProperty",
+    "ChildIndex": "0",
+    "LeftUsr": "c:objc(cs)PropertyUserInterface(im)setURL:",
+    "LeftComment": "",
+    "RightUsr": "",
+    "RightComment": "",
+    "ModuleName": "bar"
+  },
   {
     "DiffItemKind": "CommonDiffItem",
     "NodeKind": "Function",

test/Migrator/Inputs/API.json

@@ -25,6 +25,7 @@ enum BarForwardDeclaredEnum {
 - (int) field;
 - (int * _Nullable) field2;
 - (void) setField:(int)info;
+- (void) setURL:(int)url;
 + (int) fieldPlus;
 + (void) methodPlus:(int)info;
 + (void) methodPlus;

test/Migrator/mock-sdk/Bar.framework/Headers/Bar.h

@@ -11,5 +11,6 @@ Old()
 
 func foo(_ a : PropertyUserInterface) {
   a.setField(1)
+  a.setURL(1)
   _ = a.field()
 }

test/Migrator/pre_fixit_pass.swift

@@ -10,6 +10,7 @@ struct Old {}
 New()
 
 func foo(_ a : PropertyUserInterface) {
-  a.Field = 1
+  a.field = 1
+  a.url = 1
   _ = a.field
 }

test/Migrator/pre_fixit_pass.swift.expected

@@ -7,6 +7,7 @@ import Bar
 
 func foo(_ a : PropertyUserInterface) {
   a.setField(1)
+  a.setURL(1)
   _ = a.field()
 }
 

test/Migrator/property.swift

@@ -6,7 +6,8 @@
 import Bar
 
 func foo(_ a : PropertyUserInterface) {
-  a.Field = 1
+  a.field = 1
+  a.url = 1
   _ = a.field
 }
 

test/Migrator/property.swift.expected

@@ -508,3 +508,12 @@ if #available(OSX 10.13, iOS 11.0, watchOS 4.0, tvOS 11.0, *) {
 		expectTrue(result == .success)
 	}
 }
+
+#if swift(>=4.0)
+DispatchAPI.test("DispatchTimeInterval.never.equals") {
+	expectTrue(DispatchTimeInterval.never == DispatchTimeInterval.never)
+	expectTrue(DispatchTimeInterval.seconds(10) != DispatchTimeInterval.never);
+	expectTrue(DispatchTimeInterval.never != DispatchTimeInterval.seconds(10));
+	expectTrue(DispatchTimeInterval.seconds(10) == DispatchTimeInterval.seconds(10));
+}
+#endif