Remove non-inclusive language (#2954)

rdar://problem/69396992

Author: neonichu

Sources/PackageLoading/Target+PkgConfig.swift

@@ -72,16 +72,16 @@ public func pkgConfigArgs(for target: SystemLibraryTarget, diagnostics: Diagnost
             fileSystem: fileSystem,
             brewPrefix: brewPrefix)
 
-        // Run the whitelist checker.
-        let filtered = whitelist(pcFile: pkgConfigName, flags: (pkgConfig.cFlags, pkgConfig.libs))
+        // Run the allow list checker.
+        let filtered = allowlist(pcFile: pkgConfigName, flags: (pkgConfig.cFlags, pkgConfig.libs))
 
         // Remove any default flags which compiler adds automatically.
         let (cFlags, libs) = removeDefaultFlags(cFlags: filtered.cFlags, libs: filtered.libs)
 
         // Set the error if there are any unallowed flags.
         var error: Swift.Error?
         if !filtered.unallowed.isEmpty {
-            error = PkgConfigError.nonWhitelistedFlags(filtered.unallowed.joined(separator: ", "))
+            error = PkgConfigError.prohibitedFlags(filtered.unallowed.joined(separator: ", "))
         }
 
         return PkgConfigResult(
@@ -170,7 +170,7 @@ extension SystemPackageProviderDescription {
 /// compiler/linker. List of allowed flags:
 /// cFlags: -I, -F
 /// libs: -L, -l, -F, -framework, -w
-public func whitelist(
+public func allowlist(
     pcFile: String,
     flags: (cFlags: [String], libs: [String])
 ) -> (cFlags: [String], libs: [String], unallowed: [String]) {

Tests/PackageLoadingTests/Inputs/Bar.pc

@@ -7,5 +7,5 @@ Name: Foo
 URL: http://127.0.0.1/
 Description: The one and only SystemModule
 Version: 1.10.0
-Cflags: -I${includedir} -I/path/to/inc -DBlackListed
+Cflags: -I${includedir} -I/path/to/inc -DDenyListed
 Libs: -L${libdir} -L/usr/da/lib -lSystemModule -lok

Tests/PackageLoadingTests/PkgConfigTests.swift

@@ -81,7 +81,7 @@ class PkgConfigTests: XCTestCase {
             XCTAssertFalse(result.couldNotFindConfigFile)
         }
 
-        // Pc file with non whitelisted flags.
+        // Pc file with prohibited flags.
         try withCustomEnv(["PKG_CONFIG_PATH": inputsDir.pathString]) {
             let result = pkgConfigArgs(for: SystemLibraryTarget(pkgConfig: "Bar"), diagnostics: diagnostics)!
             XCTAssertEqual(result.pkgConfigName, "Bar")
@@ -90,8 +90,8 @@ class PkgConfigTests: XCTestCase {
             XCTAssertNil(result.provider)
             XCTAssertFalse(result.couldNotFindConfigFile)
             switch result.error {
-            case PkgConfigError.nonWhitelistedFlags(let desc)?:
-                XCTAssertEqual(desc, "-DBlackListed")
+            case PkgConfigError.prohibitedFlags(let desc)?:
+                XCTAssertEqual(desc, "-DDenyListed")
             default:
                 XCTFail("unexpected error \(result.error.debugDescription)")
             }

Tests/PackageLoadingTests/WhitelistTests.swift

@@ -11,24 +11,24 @@
 import PackageLoading
 import XCTest
 
-final class PkgConfigWhitelistTests: XCTestCase {
+final class PkgConfigAllowlistTests: XCTestCase {
     func testSimpleFlags() {
         let cFlags = ["-I/usr/local/Cellar/gtk+3/3.18.9/include/gtk-3.0"]
         let libs = ["-L/usr/local/Cellar/gtk+3/3.18.9/lib", "-lgtk-3", "-w"]
-        XCTAssertTrue(whitelist(pcFile: "dummy", flags: (cFlags, libs)).unallowed.isEmpty)
+        XCTAssertTrue(allowlist(pcFile: "dummy", flags: (cFlags, libs)).unallowed.isEmpty)
     }
 
     func testFlagsWithInvalidFlags() {
         let cFlags = ["-I/usr/local/Cellar/gtk+3/3.18.9/include/gtk-3.0", "-L/hello"]
         let libs = ["-L/usr/local/Cellar/gtk+3/3.18.9/lib", "-lgtk-3", "-module-name", "name", "-werror"]
-        let unallowed = whitelist(pcFile: "dummy", flags: (cFlags, libs)).unallowed
+        let unallowed = allowlist(pcFile: "dummy", flags: (cFlags, libs)).unallowed
         XCTAssertEqual(unallowed, ["-L/hello", "-module-name", "name", "-werror"])
     }
 
     func testFlagsWithValueInNextFlag() {
         let cFlags = ["-I/usr/local", "-I", "/usr/local/Cellar/gtk+3/3.18.9/include/gtk-3.0", "-L/hello"]
         let libs = ["-L", "/usr/lib", "-L/usr/local/Cellar/gtk+3/3.18.9/lib", "-lgtk-3", "-module-name", "-lcool", "ok", "name"]
-        let unallowed = whitelist(pcFile: "dummy", flags: (cFlags, libs)).unallowed
+        let unallowed = allowlist(pcFile: "dummy", flags: (cFlags, libs)).unallowed
         XCTAssertEqual(unallowed, ["-L/hello", "-module-name", "ok", "name"])
     }
 

swift-tools-support-core/Sources/TSCBasic/StringConversions.swift

@@ -14,7 +14,7 @@
 ///     - codeUnit: The code unit to be checked.
 ///
 /// - Returns: True if shell escaping is not needed.
-private func inShellWhitelist(_ codeUnit: UInt8) -> Bool {
+private func inShellAllowlist(_ codeUnit: UInt8) -> Bool {
   #if os(Windows)
     if codeUnit == UInt8(ascii: "\\") {
         return true
@@ -49,8 +49,8 @@ extension String {
     /// - Returns: Shell escaped string.
     public func spm_shellEscaped() -> String {
 
-        // If all the characters in the string are in whitelist then no need to escape.
-        guard let pos = utf8.firstIndex(where: { !inShellWhitelist($0) }) else {
+        // If all the characters in the string are in the allow list then no need to escape.
+        guard let pos = utf8.firstIndex(where: { !inShellAllowlist($0) }) else {
             return self
         }
 

swift-tools-support-core/Sources/TSCTestSupport/PseudoTerminal.swift

@@ -14,43 +14,43 @@ import TSCLibc
 #if os(Windows)
 #else
 public final class PseudoTerminal {
-    let master: Int32
-    let slave: Int32
+    let primary: Int32
+    let secondary: Int32
     public var outStream: LocalFileOutputByteStream
 
     public init?(){
-        var master: Int32 = 0
-        var slave: Int32 = 0
-        if openpty(&master, &slave, nil, nil, nil) != 0 {
+        var primary: Int32 = 0
+        var secondary: Int32 = 0
+        if openpty(&primary, &secondary, nil, nil, nil) != 0 {
             return nil
         }
-        guard let outStream = try? LocalFileOutputByteStream(filePointer: fdopen(slave, "w"), closeOnDeinit: false) else {
+        guard let outStream = try? LocalFileOutputByteStream(filePointer: fdopen(secondary, "w"), closeOnDeinit: false) else {
             return nil
         }
         self.outStream = outStream
-        self.master = master
-        self.slave = slave
+        self.primary = primary
+        self.secondary = secondary
     }
 
-    public func readMaster(maxChars n: Int = 1000) -> String? {
+    public func readPrimary(maxChars n: Int = 1000) -> String? {
         var buf: [CChar] = [CChar](repeating: 0, count: n)
-        if read(master, &buf, n) <= 0 {
+        if read(primary, &buf, n) <= 0 {
             return nil
         }
         return String(cString: buf)
     }
 
-    public func closeSlave() {
-        _ = TSCLibc.close(slave)
+    public func closeSecondary() {
+        _ = TSCLibc.close(secondary)
     }
 
-    public func closeMaster() {
-        _ = TSCLibc.close(master)
+    public func closePrimary() {
+        _ = TSCLibc.close(primary)
     }
 
     public func close() {
-        closeSlave()
-        closeMaster()
+        closeSecondary()
+        closePrimary()
     }
 }
 #endif

swift-tools-support-core/Sources/TSCUtility/PkgConfig.swift

@@ -14,16 +14,16 @@ import Foundation
 public enum PkgConfigError: Swift.Error, CustomStringConvertible {
     case couldNotFindConfigFile(name: String)
     case parsingError(String)
-    case nonWhitelistedFlags(String)
+    case prohibitedFlags(String)
 
     public var description: String {
         switch self {
         case .couldNotFindConfigFile(let name):
             return "couldn't find pc file for \(name)"
         case .parsingError(let error):
             return "parsing error(s): \(error)"
-        case .nonWhitelistedFlags(let flags):
-            return "non whitelisted flag(s): \(flags)"
+        case .prohibitedFlags(let flags):
+            return "prohibited flag(s): \(flags)"
         }
     }
 }

swift-tools-support-core/Tests/TSCBasicTests/TerminalControllerTests.swift

@@ -23,19 +23,19 @@ final class TerminalControllerTests: XCTestCase {
 
         // Test red color.
         term.write("hello", inColor: .red)
-        XCTAssertEqual(pty.readMaster(), "\u{1B}[31mhello\u{1B}[0m")
+        XCTAssertEqual(pty.readPrimary(), "\u{1B}[31mhello\u{1B}[0m")
 
         // Test clearLine.
         term.clearLine()
-        XCTAssertEqual(pty.readMaster(), "\u{1B}[2K\r")
+        XCTAssertEqual(pty.readPrimary(), "\u{1B}[2K\r")
 
         // Test endline.
         term.endLine()
-        XCTAssertEqual(pty.readMaster(), "\r\n")
+        XCTAssertEqual(pty.readPrimary(), "\r\n")
 
         // Test move cursor.
         term.moveCursor(up: 3)
-        XCTAssertEqual(pty.readMaster(), "\u{1B}[3A")
+        XCTAssertEqual(pty.readPrimary(), "\u{1B}[3A")
 
         // Test color wrapping.
         var wrapped = term.wrap("hello", inColor: .noColor)

swift-tools-support-core/Tests/TSCUtilityTests/ProgressAnimationTests.swift

@@ -108,18 +108,18 @@ final class ProgressAnimationTests: XCTestCase {
 
         var output = ""
         let thread = Thread {
-            while let out = terminal.readMaster() {
+            while let out = terminal.readPrimary() {
                 output += out
             }
         }
 
         thread.start()
         closure(terminal)
-        terminal.closeSlave()
+        terminal.closeSecondary()
 
         // Make sure to read the complete output before checking it.
         thread.join()
-        terminal.closeMaster()
+        terminal.closePrimary()
 
         return output
     }