Remove trailing semi-colons in .swift files

test/1_stdlib/SceneKit.swift

@@ -38,8 +38,8 @@ if #available(iOS 8.0, OSX 10.10, *) {
     node.position.z = scn_float_from_cg
     expectTrue(SCNVector3EqualToVector3(node.position, scn_vec3_ref))
 
-    let f1: SCNFloat = scn_vec3_ref.x;
-    let f2: SCNFloat = scn_vec4_ref.y;
+    let f1: SCNFloat = scn_vec3_ref.x
+    let f2: SCNFloat = scn_vec4_ref.y
     expectEqual(f1, 1.0);
     expectEqual(f2, 2.0);
   }

test/BuildConfigurations/basicDeclarations.swift

@@ -3,7 +3,7 @@
 class A {}
 
 #if FOO
-typealias A1 = A;
+typealias A1 = A
 #endif
 var a: A = A()
 var a1: A1 = A1() // should not result in an error
@@ -16,14 +16,14 @@ var c = C() // should not result in an error
 
 class D {
 #if FOO
-	var x: Int;
+	var x: Int
 #endif
 
 	init() {
 #if !BAR
 		x = "BAR"; // should not result in an error
 #else
-		x = 1;
+		x = 1
 #endif
 	}
 }
@@ -48,13 +48,13 @@ var i: Int = f1()
 
 protocol P1 { 
 #if FOO
-  func fFOO() -> Int;
+  func fFOO() -> Int
 #endif
 
 #if !BAR
-  func fNotBAR() -> Int;
+  func fNotBAR() -> Int
 #else
-  func fBAR() -> Int;
+  func fBAR() -> Int
 #endif
 }
 

test/BuildConfigurations/module_top_level.swift

@@ -4,6 +4,6 @@
 class C {}
 
 func > (lhs: C, rhs: C) -> Bool {
-  return false;
+  return false
 }
 #endif

test/BuildConfigurations/pound-if-inside-function-4.swift

@@ -5,7 +5,7 @@
 
 func foo() { // expected-note {{to match this opening '{'}}
 #if BLAH
-  _ = 123;
+  _ = 123
 #elseif !BLAH
 #else
 #else // expected-error{{further conditions after #else are unreachable}}

test/ClangModules/no-sdk.swift

@@ -2,6 +2,6 @@
 // RUN: %target-swift-frontend -parse -sdk "" -I %S/Inputs/custom-modules %s
 
 // Verify that we can still import modules even without an SDK.
-import ExternIntX;
+import ExternIntX
 
 let y: CInt = ExternIntX.x

test/ClangModules/nullability_silgen.swift

@@ -2,7 +2,7 @@
 
 // REQUIRES: objc_interop
 
-import nullability;
+import nullability
 
 // null_resettable properties.
 // CHECK-LABEL: sil hidden @_TF18nullability_silgen18testNullResettable

test/Constraints/closures.swift

@@ -19,7 +19,7 @@ mySort(strings, { x, y in x < y })
 
 // Closures with inout arguments.
 func f0<T, U>(t: T, _ f: (inout T) -> U) -> U {
-  var t2 = t;
+  var t2 = t
   return f(&t2)
 }
 

test/DebugInfo/argument.swift

@@ -64,5 +64,5 @@ func uncurry (a: Int64) (b: Int64) -> (Int64, Int64) {
 // CHECK: !DILocalVariable(name: "x", arg: 1,{{.*}} line: [[@LINE+2]]
 // CHECK: !DILocalVariable(name: "y", arg: 2,{{.*}} line: [[@LINE+1]]
 func tuple(x: Int64, y: (Int64, Float, String)) -> Int64 {
-  return x+y.0;
+  return x+y.0
 }

test/DebugInfo/generic_args.swift

@@ -3,7 +3,7 @@
 func markUsed<T>(t: T) {}
 
 protocol AProtocol {
-  func f() -> String;
+  func f() -> String
 }
 class AClass : AProtocol {
   func f() -> String { return "A" }

test/DebugInfo/linetable.swift

@@ -12,7 +12,7 @@ class MyClass
     init(input: Int64) { x = input }
     func do_something(input: Int64) -> Int64
     {
-        return x * input;
+        return x * input
     }
 }
 

test/DebugInfo/patternmatching.swift

@@ -8,7 +8,7 @@ func markUsed<T>(t: T) {}
 func classifyPoint2(p: (Double, Double)) {
     func return_same (input : Double) -> Double {
         var input = input
-        return input;
+        return input
     }
 
 switch p {

test/DebugInfo/protocol.swift

@@ -9,8 +9,8 @@ class Point : PointUtils {
     var x : Float
     var y : Float
     init (_x : Float, _y : Float) {
-        x = _x;
-        y = _y;
+        x = _x
+        y = _y
     }
 
     func distanceFromOrigin() -> Float {

test/DebugInfo/returnlocation.swift

@@ -13,7 +13,7 @@ import Foundation
 public func none(inout a: Int64) {
   // CHECK_NONE: call void @llvm.dbg{{.*}}, !dbg
   // CHECK_NONE: !dbg ![[NONE_INIT:.*]]
-  a -= 2;
+  a -= 2
   // CHECK_NONE: ret {{.*}}, !dbg ![[NONE_RET:.*]]
   // CHECK_NONE: ![[NONE_INIT]] = !DILocation(line: [[@LINE-2]], column:
   // CHECK_NONE: ![[NONE_RET]] = !DILocation(line: [[@LINE+1]], column: 1,
@@ -28,7 +28,7 @@ public func empty(inout a: Int64) {
       return
   }
 
-  a -= 2;
+  a -= 2
   // CHECK-DAG_EMPTY: br {{.*}}, !dbg ![[EMPTY_RET2:.*]]
   // CHECK-DAG_EMPTY_RET2: ![[EMPTY_RET]] = !DILocation(line: [[@LINE+1]], column: 3,
   return
@@ -40,10 +40,10 @@ public func empty(inout a: Int64) {
 // CHECK_EMPTY_NONE: define {{.*}}empty_none
 public func empty_none(inout a: Int64) {
   if a > 24 {
-      return;
+      return
   }
 
-  a -= 2;
+  a -= 2
   // CHECK_EMPTY_NONE: ret {{.*}}, !dbg ![[EMPTY_NONE_RET:.*]]
   // CHECK_EMPTY_NONE: ![[EMPTY_NONE_RET]] = !DILocation(line: [[@LINE+1]], column: 1,
 }
@@ -52,7 +52,7 @@ public func empty_none(inout a: Int64) {
 // CHECK_SIMPLE_RET: define {{.*}}simple
 public func simple(a: Int64) -> Int64 {
   if a > 24 {
-      return 0;
+      return 0
   }
   return 1
   // CHECK_SIMPLE_RET: ret i{{.*}}, !dbg ![[SIMPLE_RET:.*]]
@@ -108,7 +108,7 @@ public func cleanup_none(inout a: NSString) {
 // CHECK_CLEANUP_EMPTY: define {{.*}}cleanup_empty
 public func cleanup_empty(inout a: NSString) {
   if a.length > 24 {
-      return;
+      return
     }
 
   a = "empty"
@@ -121,7 +121,7 @@ public func cleanup_empty(inout a: NSString) {
 // CHECK_CLEANUP_EMPTY_NONE: define {{.*}}cleanup_empty_none
 public func cleanup_empty_none(inout a: NSString) {
   if a.length > 24 {
-      return;
+      return
     }
 
   a = "empty"

test/DebugInfo/typearg.swift

@@ -1,7 +1,7 @@
 // RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s
 
 protocol AProtocol {
-  func f() -> String;
+  func f() -> String
 }
 class AClass : AProtocol {
   func f() -> String { return "A" }

test/DebugInfo/variables.swift

@@ -11,17 +11,17 @@
 // CHECK-DAG: ![[TLC:.*]] = !DIModule({{.*}}, name: "variables"
 
 // Global variables.
-var glob_i8:   Int8 = 8;
+var glob_i8:   Int8 = 8
 // CHECK-DAG: !DIGlobalVariable(name: "glob_i8",{{.*}} scope: ![[TLC]],{{.*}} line: [[@LINE-1]],{{.*}} type: ![[I8:[^,]+]]
-var glob_i16:  Int16 = 16;
+var glob_i16:  Int16 = 16
 // CHECK-DAG: !DIGlobalVariable(name: "glob_i16",{{.*}} scope: ![[TLC]],{{.*}} line: [[@LINE-1]],{{.*}} type: ![[I16:[^,]+]]
-var glob_i32:  Int32 = 32;
+var glob_i32:  Int32 = 32
 // CHECK-DAG: !DIGlobalVariable(name: "glob_i32",{{.*}} scope: ![[TLC]],{{.*}} line: [[@LINE-1]],{{.*}} type: ![[I32:[^,]+]]
-var glob_i64:  Int64 = 64;
+var glob_i64:  Int64 = 64
 // CHECK-DAG: !DIGlobalVariable(name: "glob_i64",{{.*}} scope: ![[TLC]],{{.*}} line: [[@LINE-1]],{{.*}} type: ![[I64:[^,]+]]
-var glob_f:    Float = 2.89;
+var glob_f:    Float = 2.89
 // CHECK-DAG: !DIGlobalVariable(name: "glob_f",{{.*}} scope: ![[TLC]],{{.*}} line: [[@LINE-1]],{{.*}} type: ![[F:[^,]+]]
-var glob_d:    Double = 3.14;
+var glob_d:    Double = 3.14
 // CHECK-DAG: !DIGlobalVariable(name: "glob_d",{{.*}} scope: ![[TLC]],{{.*}} line: [[@LINE-1]],{{.*}} type: ![[D:[^,]+]]
 var glob_b:    Bool = true
 // CHECK-DAG: !DIGlobalVariable(name: "glob_b",{{.*}} scope: ![[TLC]],{{.*}} line: [[@LINE-1]],{{.*}} type: ![[B:[^,]+]]
@@ -47,10 +47,10 @@ var unused: Int32 = -1
 func foo(dt: Float) -> Float {
   // CHECK-DAG: call void @llvm.dbg.declare
   // CHECK-DAG: !DILocalVariable(name: "f"
-  var f: Float = 9.78;
+  var f: Float = 9.78
   // CHECK-DAG: !DILocalVariable(name: "r"
-  var r: Float = f*dt;
-  return r;
+  var r: Float = f*dt
+  return r
 }
 
 var g = foo(1.0);

test/Generics/associated_self_constraints.swift

@@ -50,7 +50,7 @@ class Subject<T>: Observer, Observable {
             observer.onError(error)
         }
         
-        return self;
+        return self
     }
 }
 

test/Generics/function_defs.swift

@@ -14,7 +14,7 @@ protocol EqualComparable {
 func doCompare<T : EqualComparable, U : EqualComparable>(t1: T, t2: T, u: U) -> Bool {
   var b1 = t1.isEqual(t2)
   if b1 {
-    return true;
+    return true
   }
 
   return t1.isEqual(u) // expected-error {{cannot invoke 'isEqual' with an argument list of type '(U)'}}
@@ -195,7 +195,7 @@ func conformanceViaRequires<T
      >(t1: T, t2: T) -> Bool {
   let b1 = t1.isEqual(t2)
   if b1 || t1.isLess(t2) {
-    return true;
+    return true
   }
 }
 

test/IDE/complete_unresolved_members.swift

@@ -49,7 +49,7 @@ enum SomeEnum3 {
 }
 
 struct NotOptions1 {
-  static let NotSet = 1;
+  static let NotSet = 1
 }
 
 struct SomeOptions1 : OptionSetType {

test/IRGen/Inputs/report_dead_method_call/main.swift

@@ -38,5 +38,5 @@ case 3:
 	callPublicClass()
 
 default:
-	break;
+	break
 }

test/IRGen/abitypes.swift

@@ -103,7 +103,7 @@ class Foo {
   // Make sure the caller-side from Swift also uses indirect-byval for the argument
   // x86_64-macosx: define hidden float @_TFC8abitypes3Foo25getXFromRectIndirectSwift{{.*}}(%VSC6MyRect* noalias nocapture dereferenceable({{.*}}), %C8abitypes3Foo*) {{.*}} {
   func getXFromRectIndirectSwift(r: MyRect) -> Float {
-    let f : Float = 1.0;
+    let f : Float = 1.0
     // x86_64-macosx: [[TEMP:%.*]] = alloca [[TEMPTYPE:%.*]], align 4
     // x86_64-macosx: [[RESULT:%.*]] = call float bitcast (void ()* @objc_msgSend to float (i8*, i8*, float, float, float, float, float, float, float, [[TEMPTYPE]]*)*)(i8* %{{.*}}, i8* %{{.*}}, float 1.000000e+00, float 1.000000e+00, float 1.000000e+00, float 1.000000e+00, float 1.000000e+00, float 1.000000e+00, float 1.000000e+00, [[TEMPTYPE]]* byval align 4 [[TEMP]])
     // x86_64-macosx: ret float [[RESULT]]
@@ -427,7 +427,7 @@ class Foo {
   // Test that the makeOne() that we generate somewhere below doesn't
   // use arm_aapcscc for armv7.
   func callInline() -> Float {
-    return makeOne(3,5).second;
+    return makeOne(3,5).second
   }
 }
 

test/IRGen/objc_class_export.swift

@@ -96,7 +96,7 @@ struct BigStructWithNativeObjects {
   // CHECK:   call void @_TFC17objc_class_export3Foo6boundsfT_VSC6NSRect([[NSRECT]]* noalias nocapture sret {{.*}}, [[FOO]]* [[CAST]])
 
   func convertRectToBacking(r r: NSRect) -> NSRect {
-    return r;
+    return r
   }
   // CHECK: define internal void @_TToFC17objc_class_export3Foo20convertRectToBackingfT1rVSC6NSRect_S1_([[NSRECT]]* noalias nocapture sret, [[OPAQUE5:%.*]]*, i8*, [[NSRECT]]* byval align 8) unnamed_addr {{.*}} {
   // CHECK:   [[CAST:%[a-zA-Z0-9]+]] = bitcast [[OPAQUE5]]* %1 to [[FOO]]*

test/IRGen/objc_subclass.swift

@@ -280,7 +280,7 @@ class SwiftGizmo : Gizmo {
   var x = Int()
 
   func getX() -> Int {
-    return x;
+    return x
   }
 
   override func duplicate() -> Gizmo {

test/IRGen/objc_type_encoding.swift

@@ -112,7 +112,7 @@ func testArchetype(work: P3) {
 // CHECK-tvos: private unnamed_addr constant [11 x i8] c"v24@0:8@16\00"
 
 @objc func foo(x: Int -> Int) -> Int {
-  return 1;
+  return 1
 }
 // CHECK-macosx: private unnamed_addr constant [12 x i8] c"q24@0:8@?16\00"
 // CHECK-ios: private unnamed_addr constant [12 x i8] c"q24@0:8@?16\00"

test/IRGen/sil_witness_tables_inherited_conformance.swift

@@ -11,7 +11,7 @@ class Cat : Panda {
   required init() { }
 
   func getCutenessLevel() -> Int {
-    return 3;
+    return 3
   }
 }
 

test/Parse/trailing-semi.swift

@@ -14,7 +14,7 @@ struct SpuriousSemi {
 }
 
 class C {
-  var a : Int = 10;
+  var a : Int = 10
   func b () {};
   class func c () {};
 }

test/PrintAsObjC/imports.swift

@@ -25,12 +25,12 @@ import ctypes.bits
 import Foundation
 
 import Base
-import Base.ImplicitSub;
-import Base.ImplicitSub.ImSub;
-import Base.ImplicitSub.ExSub;
-import Base.ExplicitSub;
-import Base.ExplicitSub.ImSub;
-import Base.ExplicitSub.ExSub;
+import Base.ImplicitSub
+import Base.ImplicitSub.ImSub
+import Base.ImplicitSub.ExSub
+import Base.ExplicitSub
+import Base.ExplicitSub.ImSub
+import Base.ExplicitSub.ExSub
 
 @objc class Test {
   let word: DWORD = 0

test/PrintAsObjC/local-types.swift

@@ -81,7 +81,7 @@ class ANonObjCClass {}
   func b(b: ZForwardProtocol1) {}
 }
 
-typealias ZForwardAlias = ZForwardAliasClass;
+typealias ZForwardAlias = ZForwardAliasClass
 @objc class ZForwardAliasClass {}
 
 // CHECK-NOT: @class UseForward;

test/SILGen/coverage_guard.swift

@@ -14,7 +14,7 @@ func foo(x : Int32) { // CHECK: [[@LINE]]:21 -> [[END:[0-9]+:2]] : 0
     return
   } // CHECK: [[@LINE]]:4 -> [[END]] : (((0 - 1) - 2) - 4)
 
-  let z = x;
+  let z = x
 }
 
 foo(1);

test/SILGen/sil_locations.swift

@@ -3,11 +3,11 @@
 // FIXME: Not sure if this an ideal source info for the branch - 
 // it points to if, not the last instruction in the block.
 func ifexpr() -> Int {
-  var x : Int = 0; 
+  var x : Int = 0
   if true {
     x++; 
   }
-  return x;
+  return x
   // CHECK-LABEL: sil hidden  @_TF13sil_locations6ifexprFT_Si
   // CHECK: apply {{.*}} line:[[@LINE-5]]:6
   // CHECK: cond_br {{%.*}}, [[TRUE_BB:bb[0-9]+]], [[FALSE_BB:bb[0-9]+]] // {{.*}} line:[[@LINE-6]]:6
@@ -16,13 +16,13 @@ func ifexpr() -> Int {
 }
 
 func ifelseexpr() -> Int {
-  var x : Int = 0; 
+  var x : Int = 0
   if true {
     x++; 
   } else {
     x--;
   }
-  return x;
+  return x
   // CHECK-LABEL: sil hidden  @_TF13sil_locations10ifelseexprFT_Si
   // CHECK: cond_br {{%.*}}, [[TRUE_BB:bb[0-9]+]], [[FALSE_BB:bb[0-9]+]] // {{.*}} line:[[@LINE-7]]:6
   // CHECK: [[TRUE_BB]]:
@@ -37,9 +37,9 @@ func ifelseexpr() -> Int {
 // in the branch.
 func ifexpr_return() -> Int {
   if true {
-    return 5; 
+    return 5
   }
-  return 6;
+  return 6
   // CHECK-LABEL: sil hidden  @_TF13sil_locations13ifexpr_returnFT_Si
   // CHECK: apply {{.*}} line:[[@LINE-5]]:6
   // CHECK: cond_br {{%.*}}, [[TRUE_BB:bb[0-9]+]], [[FALSE_BB:bb[0-9]+]] // {{.*}} line:[[@LINE-6]]:6
@@ -51,8 +51,8 @@ func ifexpr_return() -> Int {
 }
 
 func ifexpr_rval() -> Int {
-  var x = true ? 5 : 6;
-  return x;
+  var x = true ? 5 : 6
+  return x
   // CHECK-LABEL: sil hidden  @_TF13sil_locations11ifexpr_rvalFT_Si
   // CHECK: apply {{.*}} line:[[@LINE-3]]:11
   // CHECK: cond_br {{%.*}}, [[TRUE_BB:bb[0-9]+]], [[FALSE_BB:bb[0-9]+]] // {{.*}} line:[[@LINE-4]]:11
@@ -104,7 +104,7 @@ class LocationClass {
   func mem() {}
 }
 func testMethodCall() {
-  var l: LocationClass;
+  var l: LocationClass
   l.mem();
   // CHECK-LABEL: sil hidden  @_TF13sil_locations14testMethodCallFT_T_
   
@@ -112,9 +112,9 @@ func testMethodCall() {
 }
 
 func multipleReturnsImplicitAndExplicit() {
-  var x = 5+3;
+  var x = 5+3
   if x > 10 {
-    return;
+    return
   }
   x++;
   // CHECK-LABEL: sil hidden  @_TF13sil_locations34multipleReturnsImplicitAndExplicitFT_T_
@@ -156,9 +156,9 @@ func testSwitch() {
 
 func testIf() {
   if true {
-    var y:Int;
+    var y:Int
   } else {
-    var x:Int;
+    var x:Int
   }
   // CHECK-LABEL: sil hidden @_TF13sil_locations6testIfFT_T_
   //
@@ -176,13 +176,13 @@ func testIf() {
 
 func testFor() {
   for (var i:Int = 0; i<10; i++) {
-    var y: Int = 300;
+    var y: Int = 300
     y++;
     if true {
-      break;
+      break
     }
     y--;
-    continue;
+    continue
   }
 
   // CHECK-LABEL: sil hidden @_TF13sil_locations7testForFT_T_
@@ -324,7 +324,7 @@ func printSinglePayloadAddressOnly(v:SinglePayloadAddressOnly) {
 
 
 func testStringForEachStmt() {
-  var i = 0;
+  var i = 0
   for index in 1..<20 {
     i += 1
     if i == 15 {
@@ -350,8 +350,8 @@ func testStringForEachStmt() {
 
 
 func testForStmt() {
-  var i = 0;
-  var m = 0;
+  var i = 0
+  var m = 0
   for (i = 0; i < 10; ++i) {
     m += 1
     if m == 15 {
@@ -380,7 +380,7 @@ func testForStmt() {
 
 
 func testRepeatWhile() {
-  var m = 0;
+  var m = 0
   repeat {
     m += 1
   } while (m < 200)
@@ -396,7 +396,7 @@ func testRepeatWhile() {
 
 
 func testWhile() {
-  var m = 0;
+  var m = 0
   while m < 100 {
     m += 1
     if m > 5 {

test/SILGen/statements.swift

@@ -93,13 +93,13 @@ func nested_if_merge_ret(x: Int, y: Bool, z: Bool) -> Int {
     if (z) {
       bar(x);
     }
-    return 1;
+    return 1
   } else {
     if (z) {
       foo(x, y);
     }
   }
-  return 2;
+  return 2
 }
 
 // CHECK-LABEL: sil hidden  @_TF10statements19nested_if_merge_ret
@@ -119,7 +119,7 @@ func loop_with_break(x: Int, _ y: Bool, _ z: Bool) -> Int {
   while (x > 2) {
    if (y) {
      bar(x);
-     break;
+     break
    }
   }
 }
@@ -130,7 +130,7 @@ func loop_with_continue(x: Int, y: Bool, z: Bool) -> Int {
   while (x > 2) {
     if (y) {
      bar(x);
-     continue;
+     continue
     }
     loop_with_break(x, y, z);
   }
@@ -143,7 +143,7 @@ func do_loop_with_continue(x: Int, y: Bool, z: Bool) -> Int {
   repeat {
     if (x < 42) {
      bar(x);
-     continue;
+     continue
     }
     loop_with_break(x, y, z);
   }

test/SILGen/transparent_attribute.swift

@@ -71,8 +71,8 @@ var x2 : MySt {
 func testProperty(z: MySt) {
   x1 = z
   x2 = z
-  var m1 : MySt = x1;
-  var m2 : MySt = x2;
+  var m1 : MySt = x1
+  var m2 : MySt = x2
   // CHECK-APPLY: sil hidden @_TF21transparent_attribute12testPropertyFT1zVS_4MySt_T_
   // CHECK: function_ref @_TF21transparent_attributes2x1VS_4MySt
   // CHECK-NEXT: apply

test/SILGen/unreachable_code.swift

@@ -1,8 +1,8 @@
 // RUN: %target-swift-frontend -emit-sil %s -o /dev/null -verify
 
 func testUnreachableAfterReturn() -> Int {
-  var x: Int = 3;
-  return x;
+  var x: Int = 3
+  return x
   x += 1 //expected-warning {{code after 'return' will never be executed}}
 }
 
@@ -17,34 +17,34 @@ func testUnreachableAfterIfReturn(a: Bool) -> Int {
 
 func testUnreachableForAfterContinue(b: Bool) {
   for (var i:Int = 0; i<10; i++) { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
-    var y: Int = 300;
+    var y: Int = 300
     y++;
     if b {
-      break;
+      break
       y++; // expected-warning {{code after 'break' will never be executed}}
     }
-    continue;
+    continue
     y--; // expected-warning {{code after 'continue' will never be executed}}
   }
 }
 
 func testUnreachableWhileAfterContinue(b: Bool) {
-  var i:Int = 0;
+  var i:Int = 0
   while (i<10) { 
-    var y: Int = 300;
+    var y: Int = 300
     y++;
     if b {
-      break;
+      break
       y++; // expected-warning {{code after 'break' will never be executed}}
     }
-    continue;
+    continue
     i++; // expected-warning {{code after 'continue' will never be executed}}
   }
 }
 
 func testBreakAndContinue() {
-  var i = 0;
-  var m = 0;
+  var i = 0
+  var m = 0
   for (i = 0; i < 10; ++i) { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}}
     m += 1
     if m == 15 {

test/SILOptimizer/diagnostic_constant_propagation.swift

@@ -51,7 +51,7 @@ func testGenericArithmeticOverflowMessage() {
   myaddUnsigned(250, 250, 250) // expected-error{{arithmetic operation '250 + 250' (on unsigned 8-bit integer type) results in an overflow}}
 }
 
-typealias MyInt = UInt8;
+typealias MyInt = UInt8
 
 func testConvertOverflow() {
   var _ /*int8_minus_two*/  : Int8 = (-2)
@@ -106,7 +106,7 @@ func testConvertOverflow() {
   
   var _ /*int8_max_pa*/      : Int8   = -13333; //expected-error{{integer literal '-13333' overflows when stored into 'Int8}}
   var _ /*int32_max_p_hex*/  : Int32  = 0xFFFF_FFFF; //expected-error{{integer literal '4294967295' overflows when stored into 'Int32'}}
-  var _ /*uint32_max_hex*/   : UInt32 = 0xFFFF_FFFF;
+  var _ /*uint32_max_hex*/   : UInt32 = 0xFFFF_FFFF
   var _ /*uint32_max_p_hex*/ : UInt32 = 0xFFFF_FFFF_F; //expected-error{{integer literal '68719476735' overflows when stored into 'UInt32'}}
   var _ /*uint0_typealias*/  : MyInt = 256; //expected-error{{integer literal '256' overflows when stored into 'MyInt'}}
 

test/SILOptimizer/mandatory_inlining.swift

@@ -23,7 +23,7 @@ func foo(x: Float) -> Float {
   // CHECK: return
 
 @_transparent func baz(x: Float) -> Float {
-  return x;
+  return x
 }
 
 // CHECK-LABEL: sil hidden [transparent] @_TF18mandatory_inlining3baz
@@ -148,7 +148,7 @@ enum X {
 }
 
 func testInlineUnionElement() -> X {
-  return X.onetransp;
+  return X.onetransp
   // CHECK-LABEL: sil hidden @_TF18mandatory_inlining22testInlineUnionElementFT_OS_1X
   // CHECK: enum $X, #X.onetransp!enumelt
   // CHECK-NOT = apply

test/SILOptimizer/return.swift

@@ -25,8 +25,8 @@ func multipleBlocksSingleMissing(b: Bool) -> (String, Int) {
 func multipleBlocksAllMissing(x: Int) -> Int {
   var y : Int = x + 1 
   while (y > 0 ) {
-    --y;
-    break;
+    --y
+    break
   }
   var x = 0
   x += 1
@@ -76,7 +76,7 @@ func diagnose_missing_return_no_error_after_noreturn_method() -> Int {
 } // no error
 
 func whileLoop(flag: Bool) -> Int {
-  var b = 1;
+  var b = 1
   while (flag) {
     if b == 3 {
       return 3
@@ -86,7 +86,7 @@ func whileLoop(flag: Bool) -> Int {
 } //expected-error {{missing return in a function expected to return 'Int'}}
 
 func whileTrueLoop() -> Int {
-  var b = 1;
+  var b = 1
   while (true) {
     if b == 3 {
       return 3
@@ -101,7 +101,7 @@ func testUnreachableAfterNoReturn(x: Int) -> Int {
 }
 
 func testUnreachableAfterNoReturnInADifferentBlock() -> Int {
-  let x:Int = 5;
+  let x:Int = 5
   if true {  // expected-note {{condition always evaluates to true}}
     exit(); 
   }
@@ -116,10 +116,10 @@ func testReachableAfterNoReturnInADifferentBlock(x: Int) -> Int {
 }
 
 func testUnreachableAfterNoReturnFollowedByACall() -> Int {
-  let x:Int = 5;
+  let x:Int = 5
   exit(); // expected-note{{a call to a noreturn function}}
   exit(); // expected-warning {{will never be executed}}
-  return x; 
+  return x
 }
 
 func testUnreachableAfterNoReturnMethod() -> Int {

test/SILOptimizer/sroa_unreferenced_members.swift

@@ -6,7 +6,7 @@ import gizmo
 // CHECK: %1 = alloc_stack $Drill
 // CHECK: ret
 func ModifyStruct(inDrill : Drill) -> Int32 {
-  var D : Drill = inDrill;
+  var D : Drill = inDrill
   D.x += 3
-  return D.x;
+  return D.x
 }

test/SILOptimizer/switch.swift

@@ -8,6 +8,6 @@ func non_fully_covered_switch(x: Int) -> Int {
     case 3:
      x -= 1
   } // expected-error{{switch must be exhaustive}}
-  return x;
+  return x
 }
 

test/SILOptimizer/unreachable_code.swift

@@ -160,7 +160,7 @@ func testSwitchEnum(xi: Int) -> Int {
     x -= 1
   }
   
-  return x;
+  return x
 }
 
 

test/Serialization/Inputs/def_transparent.swift

@@ -3,7 +3,7 @@
 }
 
 @_transparent public func testBuiltin() -> Int32 {
-  var y: Int32 = 300;
+  var y: Int32 = 300
   var z = "foo"
   return y
 }

test/SourceKit/Indexing/index.swift

@@ -180,7 +180,7 @@ class rdar18640140 {
   // didSet is not compatible with set/get
   var S1: Int {
     get {
-      return 1;
+      return 1
     }
     set	{
     }

test/TypeCoercion/integer_literals.swift

@@ -54,9 +54,9 @@ struct supermeters : IntegerLiteralConvertible { // expected-error{{type 'superm
 }
 
 func chaining() {
-  var length : meters = 17;
+  var length : meters = 17
   // FIXME: missing truncation warning <rdar://problem/14070127>.
-  var long_length : meters = 500;
+  var long_length : meters = 500
   var really_long_length : supermeters = 10
 }
 

test/TypeCoercion/overload_member.swift

@@ -41,8 +41,8 @@ func test_method_overload_coerce(a: A, inout x: X, inout y: Y, z: Z) {
 }
 
 func test_method_value_coerce(a: A) {
-  var _ : (X) -> X = a.f;
-  var _ : (A) -> (X) -> X = A.f;
+  var _ : (X) -> X = a.f
+  var _ : (A) -> (X) -> X = A.f
 }
 
 func test_static_method_overload(a: A, x: X, y: Y) {
@@ -62,8 +62,8 @@ func test_static_method_overload_coerce(a: A, inout x: X, inout y: Y, z: Z) {
 }
 
 func test_static_method_value_coerce(a: A) {
-  var _ : (X) -> X = A.sf;
-  var _ : (Y) -> Y = A.sf;
+  var _ : (X) -> X = A.sf
+  var _ : (Y) -> Y = A.sf
 }
 
 func test_mixed_overload(a: A, x: X, y: Y) {
@@ -87,10 +87,10 @@ func test_mixed_overload_coerce(a: A, inout x: X, y: Y, z: Z) {
 }
 
 func test_mixed_method_value_coerce(a: A) {
-  var _ : (X) -> X = a.mixed;
-  var _ : (Y) -> Y = A.mixed;
+  var _ : (X) -> X = a.mixed
+  var _ : (Y) -> Y = A.mixed
   var _ : (Y) -> Y = a.mixed; // expected-error{{cannot convert value of type '(x: X) -> X' to specified type '(Y) -> Y'}}
-  var _ : (A) -> (X) -> X = A.mixed;
+  var _ : (A) -> (X) -> X = A.mixed
 }
 
 extension A {
@@ -118,9 +118,9 @@ extension A {
   }
 
   func test_method_value_coerce() {
-    var _ : (X) -> X = f;
-    var _ : (A) -> (X) -> X = A.f;
-    var _ : (A) -> (X) -> X = A.f;
+    var _ : (X) -> X = f
+    var _ : (A) -> (X) -> X = A.f
+    var _ : (A) -> (X) -> X = A.f
   }
 
   func test_mixed_overload_coerce(inout x x: X, y: Y, z: Z) {
@@ -129,10 +129,10 @@ extension A {
   }
 
   func test_mixed_method_value_coerce() {
-    var _ : (X) -> X = mixed;
+    var _ : (X) -> X = mixed
     var _ : (Y) -> Y = mixed; // expected-error{{cannot convert value of type '(x: X) -> X' to specified type '(Y) -> Y'}}
     var _ : (Y) -> Y = mixed; // expected-error{{cannot convert value of type '(x: X) -> X' to specified type '(Y) -> Y'}}
-    var _ : (A) -> (X) -> X = A.mixed;
+    var _ : (A) -> (X) -> X = A.mixed
   }
 
   class func test_method_overload_static(x x: X, y: Y, z: Z) {
@@ -171,12 +171,12 @@ extension A {
   }
 
   class func test_mixed_method_value_coerce_static() {
-    var _ : (Y) -> Y = mixed;
-    var _ : (A) -> (X) -> X = mixed;
+    var _ : (Y) -> Y = mixed
+    var _ : (A) -> (X) -> X = mixed
   }
 }
 
-var clams : X; 
+var clams : X
 
 struct WeirdIvarLookupBehavior { 
   var clams : Y

test/TypeCoercion/overload_noncall.swift

@@ -25,8 +25,8 @@ func test_conv() {
   a8 = a9
   a9 = a7
 
-  var _ : ((X)->X) -> ((Y) -> Y) = f2;
-  var _ : ((x2 : X)-> (X)) -> (((y2 : Y) -> (Y))) = f2;
+  var _ : ((X)->X) -> ((Y) -> Y) = f2
+  var _ : ((x2 : X)-> (X)) -> (((y2 : Y) -> (Y))) = f2
 
   typealias fp = ((X)->X) -> ((Y) -> Y)
   var _ = f2
@@ -43,7 +43,7 @@ func accept_XY(inout y: Y) -> Y { }
 func accept_Z(inout z: Z) -> Z { }
 
 func test_inout() {
-  var x : X;
+  var x : X
   accept_X(&x);
   accept_X(xy); // expected-error{{passing value of type 'X' to an inout parameter requires explicit '&'}} {{12-12=&}}
   accept_X(&xy);
@@ -51,7 +51,7 @@ func test_inout() {
   accept_XY(&x);
   x = accept_XY(&xy);
 
-  x = xy;
+  x = xy
   x = &xy; // expected-error{{'&' used with non-inout argument of type 'X'}}
   accept_Z(&xy); // expected-error{{cannot convert value of type 'X' to expected argument type 'Z'}}
 }
@@ -60,8 +60,8 @@ func lvalue_or_rvalue(inout x: X) -> X { }
 func lvalue_or_rvalue(x: X) -> Y { }
 
 func test_lvalue_or_rvalue() {
-  var x : X;
-  var y : Y;
+  var x : X
+  var y : Y
   let x1 = lvalue_or_rvalue(&x)
   x = x1
   let y1 = lvalue_or_rvalue(x)

test/attr/attr_availability.swift

@@ -56,7 +56,7 @@ func useWithEscapedMessage() {
 
 // More complicated parsing.
 @available(OSX, message="x", unavailable)
-let _: Int;
+let _: Int
 
 @available(OSX, introduced=1, deprecated=2.0, obsoleted=3.0.0)
 let _: Int
@@ -66,7 +66,7 @@ let _: Int
 
 // Meaningless but accepted.
 @available(OSX, message="x")
-let _: Int;
+let _: Int
 
 
 // Parse errors.

test/decl/enum/Inputs/objc_enum_multi_file_helper.swift

@@ -3,6 +3,6 @@ func useEnum(x: TheEnum) {
   case A:
     print("a!")
   default:
-    break;
+    break
   }
 }

test/decl/enum/enumtest.swift

@@ -267,11 +267,11 @@ func testDirection() {
   switch dir {
   case .North(let x):
     i = x
-    break;
+    break
 
   case .NorthEast(let x):
     i = x.distanceEast
-    break;
+    break
   }
   _ = i
 }

test/expr/cast/array_coerce.swift

@@ -1,7 +1,7 @@
 // RUN: %target-parse-verify-swift
 
 class C {
-	var x = 0;
+	var x = 0
 }
 class D: C {}