From 4dde3239c6e085d455a28d3ab049d8526fbb95d3 Mon Sep 17 00:00:00 2001
From: neko <cronhound@gmail.com>
Date: Sat, 5 Dec 2015 20:14:54 +1030
Subject: [PATCH 1/2] enforce readability over preference.

Master and slave are conventions that have stuck with all kinds of technology for years. For someone that's new to the Swift source, the Leader/follower convention makes little sense.

I see no reason to change a practice that has been the norm for many years.
---
 .../stdlib/StringSlicesConcurrentAppend.swift | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/validation-test/stdlib/StringSlicesConcurrentAppend.swift b/validation-test/stdlib/StringSlicesConcurrentAppend.swift
index bd7ec49eab422..d186cc3b7ccf4 100644
--- a/validation-test/stdlib/StringSlicesConcurrentAppend.swift
+++ b/validation-test/stdlib/StringSlicesConcurrentAppend.swift
@@ -25,13 +25,13 @@ extension String {
 // different non-shared strings that point to the same shared buffer.
 
 enum ThreadID {
-  case Leader
-  case Follower
+  case Master
+  case Slave
 }
 
 var barrierVar: UnsafeMutablePointer<_stdlib_pthread_barrier_t> = nil
 var sharedString: String = ""
-var followerString: String = ""
+var SlaveString: String = ""
 
 func barrier() {
   var ret = _stdlib_pthread_barrier_wait(barrierVar)
@@ -41,7 +41,7 @@ func barrier() {
 func sliceConcurrentAppendThread(tid: ThreadID) {
   for i in 0..<100 {
     barrier()
-    if tid == .Leader {
+    if tid == .Master {
       // Get a fresh buffer.
       sharedString = ""
       sharedString.appendContentsOf("abc")
@@ -57,7 +57,7 @@ func sliceConcurrentAppendThread(tid: ThreadID) {
     barrier()
 
     // Append to the private string.
-    if tid == .Leader {
+    if tid == .Master {
       privateString.appendContentsOf("def")
     } else {
       privateString.appendContentsOf("ghi")
@@ -66,7 +66,7 @@ func sliceConcurrentAppendThread(tid: ThreadID) {
     barrier()
 
     // Verify that contents look good.
-    if tid == .Leader {
+    if tid == .Master {
       expectEqual("abcdef", privateString)
     } else {
       expectEqual("abcghi", privateString)
@@ -74,14 +74,14 @@ func sliceConcurrentAppendThread(tid: ThreadID) {
     expectEqual("abc", sharedString)
 
     // Verify that only one thread took ownership of the buffer.
-    if tid == .Follower {
-      followerString = privateString
+    if tid == .Slave {
+      SlaveString = privateString
     }
     barrier()
-    if tid == .Leader {
+    if tid == .Master {
       expectTrue(
         (privateString.bufferID == sharedString.bufferID) !=
-          (followerString.bufferID == sharedString.bufferID))
+          (SlaveString.bufferID == sharedString.bufferID))
     }
   }
 }
@@ -93,9 +93,9 @@ StringTestSuite.test("SliceConcurrentAppend") {
   expectEqual(0, ret)
 
   let (createRet1, tid1) = _stdlib_pthread_create_block(
-    nil, sliceConcurrentAppendThread, .Leader)
+    nil, sliceConcurrentAppendThread, .Master)
   let (createRet2, tid2) = _stdlib_pthread_create_block(
-    nil, sliceConcurrentAppendThread, .Follower)
+    nil, sliceConcurrentAppendThread, .Slave)
 
   expectEqual(0, createRet1)
   expectEqual(0, createRet2)
@@ -114,4 +114,3 @@ StringTestSuite.test("SliceConcurrentAppend") {
 }
 
 runAllTests()
-

From 678062b6abf76877d21cf35889390a68811b2904 Mon Sep 17 00:00:00 2001
From: neko <cronhound@gmail.com>
Date: Sat, 5 Dec 2015 20:19:23 +1030
Subject: [PATCH 2/2] fixed camelcase.

---
 validation-test/stdlib/StringSlicesConcurrentAppend.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/validation-test/stdlib/StringSlicesConcurrentAppend.swift b/validation-test/stdlib/StringSlicesConcurrentAppend.swift
index d186cc3b7ccf4..e89373de46591 100644
--- a/validation-test/stdlib/StringSlicesConcurrentAppend.swift
+++ b/validation-test/stdlib/StringSlicesConcurrentAppend.swift
@@ -31,7 +31,7 @@ enum ThreadID {
 
 var barrierVar: UnsafeMutablePointer<_stdlib_pthread_barrier_t> = nil
 var sharedString: String = ""
-var SlaveString: String = ""
+var slaveString: String = ""
 
 func barrier() {
   var ret = _stdlib_pthread_barrier_wait(barrierVar)
@@ -75,13 +75,13 @@ func sliceConcurrentAppendThread(tid: ThreadID) {
 
     // Verify that only one thread took ownership of the buffer.
     if tid == .Slave {
-      SlaveString = privateString
+      slaveString = privateString
     }
     barrier()
     if tid == .Master {
       expectTrue(
         (privateString.bufferID == sharedString.bufferID) !=
-          (SlaveString.bufferID == sharedString.bufferID))
+          (slaveString.bufferID == sharedString.bufferID))
     }
   }
 }