[NFC] Pick a few nits for Jordan

Author: beccadax

lib/Sema/TypeCheckDeclObjC.cpp

@@ -827,7 +827,7 @@ bool swift::isRepresentableInObjC(const SubscriptDecl *SD, ObjCReason Reason) {
   if (checkObjCInForeignClassContext(SD, Reason))
     return false;
 
-  // Obj-C doesn't support class subscripts.
+  // ObjC doesn't support class subscripts.
   if (!SD->isInstanceMember()) {
     if (Diagnose) {
       SD->diagnose(diag::objc_invalid_on_static_subscript,

test/Constraints/subscript.swift

@@ -11,15 +11,15 @@ protocol IntToStringSubscript {
   subscript (i : Int) -> String { get }
 }
 
-class LameDictionary {
+class FauxDictionary {
   subscript (i : Int) -> String {
     get {
       return String(i)
     }
   }
 }
 
-func archetypeSubscript<T : IntToStringSubscript, U : LameDictionary>(_ t: T, u: U)
+func archetypeSubscript<T : IntToStringSubscript, U : FauxDictionary>(_ t: T, u: U)
        -> String {
   // Subscript an archetype.
   if false { return t[17] }
@@ -40,7 +40,7 @@ protocol IntToStringStaticSubscript {
   static subscript (i : Int) -> String { get }
 }
 
-class LameStaticDictionary {
+class FauxStaticDictionary {
   static subscript (i : Int) -> String {
     get {
       return String(i)
@@ -49,7 +49,7 @@ class LameStaticDictionary {
 }
 
 func archetypeStaticSubscript<
-  T : IntToStringStaticSubscript, U : LameStaticDictionary
+  T : IntToStringStaticSubscript, U : FauxStaticDictionary
 >(_ t: T.Type, u: U.Type) -> String {
   // Subscript an archetype.
   if false { return t[17] }

test/Interpreter/SDK/dictionary_pattern_matching.swift

@@ -11,7 +11,7 @@ struct State {
   let abbrev: String
 }
 
-func stateFromPlistLame(_ plist: Dictionary<String, Any>) -> State? {
+func stateFromPlistVerbose(_ plist: Dictionary<String, Any>) -> State? {
   if let name = plist["name"] as? NSString {
     if let population = plist["population"] as? NSNumber {
       if let abbrev = plist["abbrev"] as? NSString {
@@ -62,22 +62,22 @@ let invalidStatePlist3: Dictionary<String, Any> = [
 // CHECK:         name: "California"
 // CHECK:         population: 38040000
 // CHECK:         abbrev: "CA"
-dump(stateFromPlistLame(goodStatePlist))
+dump(stateFromPlistVerbose(goodStatePlist))
 // CHECK-LABEL: some:
 // CHECK:         name: "California"
 // CHECK:         population: 38040000
 // CHECK:         abbrev: "CA"
 dump(stateFromPlistCool(goodStatePlist))
 // CHECK-LABEL: nil
-dump(stateFromPlistLame(invalidStatePlist1))
+dump(stateFromPlistVerbose(invalidStatePlist1))
 // CHECK-LABEL: nil
 dump(stateFromPlistCool(invalidStatePlist1))
 // CHECK-LABEL: nil
-dump(stateFromPlistLame(invalidStatePlist2))
+dump(stateFromPlistVerbose(invalidStatePlist2))
 // CHECK-LABEL: nil
 dump(stateFromPlistCool(invalidStatePlist2))
 // CHECK-LABEL: nil
-dump(stateFromPlistLame(invalidStatePlist3))
+dump(stateFromPlistVerbose(invalidStatePlist3))
 // CHECK-LABEL: nil
 dump(stateFromPlistCool(invalidStatePlist3))
 

test/Interpreter/generic_subscript_static.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information