Soundness/Unacceptable language check fixes

CMakeLists.txt

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

Sources/CMakeLists.txt

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

Sources/CSwiftScan/CMakeLists.txt

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

Sources/CSwiftScan/include/swiftscan_header.h

@@ -1,13 +1,14 @@
 //===-- swiftscan_header.h - C API for Swift Dependency Scanning --*- C -*-===//
 //
-// This source file is part of the Swift.org open source project
+// This source file is part of the Swift open source project
 //
 // Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
+// Licensed under Apache License v2.0
 //
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift project authors
 //
+// SPDX-License-Identifier: Apache-2.0
 //===----------------------------------------------------------------------===//
 
 #ifndef SWIFT_C_DEPENDENCY_SCAN_H

Sources/SwiftDriver/CMakeLists.txt

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

Sources/SwiftDriver/Driver/CompilerMode.swift

@@ -1,12 +1,14 @@
-//===--------------- CompilerMode.swift - Swift Compiler Mode -------------===//
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
 //
-// This source file is part of the Swift.org open source project
+// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0
 //
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift project authors
 //
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 /// The mode of the compiler.

Sources/SwiftDriver/Driver/DebugInfo.swift

@@ -1,12 +1,14 @@
-//===--------------- DebugInfo.swift - Swift Debug Information ------------===//
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
 //
-// This source file is part of the Swift.org open source project
+// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0
 //
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift project authors
 //
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 

Sources/SwiftDriver/Driver/Driver.swift

@@ -1,12 +1,14 @@
-//===--------------- Driver.swift - Swift Driver --------------------------===//
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
 //
-// This source file is part of the Swift.org open source project
+// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0
 //
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift project authors
 //
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 import SwiftOptions
@@ -3870,7 +3872,7 @@ extension Driver {
     }
 
     // If an explicit path is not provided by the output file map, attempt to
-    // synthesize a path from the master swift dependency path.  This is
+    // synthesize a path from the main swift dependency path.  This is
     // important as we may otherwise emit this file at the location where the
     // driver was invoked, which is normally the root of the package.
     if let path = try outputFileMap?.existingOutputForSingleInput(outputType: .swiftDeps) {

Sources/SwiftDriver/Driver/DriverVersion.swift

@@ -1,12 +1,14 @@
-//===------ DriverVersion.swift - Swift Driver Source Version--------------===//
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
 //
-// This source file is part of the Swift.org open source project
+// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0
 //
-// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift project authors
 //
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 extension Driver {

Sources/SwiftDriver/Driver/LinkKind.swift

@@ -1,12 +1,14 @@
-//===--------------- LinkKind.swift - Swift Linking Kind ------------------===//
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
 //
-// This source file is part of the Swift.org open source project
+// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0
 //
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift project authors
 //
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 

Sources/SwiftDriver/Driver/ModuleOutputInfo.swift

@@ -1,12 +1,14 @@
-//===--------------- ModuleOutputInfo.swift - Module output information ---===//
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
 //
-// This source file is part of the Swift.org open source project
+// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0
 //
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift project authors
 //
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 

Sources/SwiftDriver/Driver/OutputFileMap.swift

@@ -1,12 +1,14 @@
-//===--------------- OutputFileMap.swift - Swift Output File Map ----------===//
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
 //
-// This source file is part of the Swift.org open source project
+// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0
 //
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift project authors
 //
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 
@@ -262,9 +264,9 @@ fileprivate struct OutputFileMapJSON: Codable {
     _ entries: [VirtualPath.Handle : [FileType : VirtualPath.Handle]]
   ) -> Self {
     func convert(entry: (key: VirtualPath.Handle, value: [FileType: VirtualPath.Handle])) -> (String, Entry) {
-      // We use a VirtualPath with an empty path for the master entry, but its name is "." and we need ""
-      let fixedIfMaster = VirtualPath.lookup(entry.key).name == "." ? "" : VirtualPath.lookup(entry.key).name
-      return (fixedIfMaster, convert(outputs: entry.value))
+      // We use a VirtualPath with an empty path for the main entry, but its name is "." and we need ""
+      let fixedIfMain = VirtualPath.lookup(entry.key).name == "." ? "" : VirtualPath.lookup(entry.key).name
+      return (fixedIfMain, convert(outputs: entry.value))
     }
     func convert(outputs: [FileType: VirtualPath.Handle]) -> Entry {
       Entry(paths: outputs.mapValues({ VirtualPath.lookup($0).name }))

Sources/SwiftDriver/Driver/ToolExecutionDelegate.swift

@@ -1,12 +1,14 @@
-//===--------------- ToolExecutionDelegate.swift - Tool Execution Delegate ===//
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
 //
-// This source file is part of the Swift.org open source project
+// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0
 //
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift project authors
 //
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 

Sources/SwiftDriver/Driver/WindowsExtensions.swift

@@ -1,12 +1,14 @@
-//===------------- WindowsExtensions.swift - Windows Extensions -----------===//
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
 //
-// This source file is part of the Swift.org open source project
+// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0
 //
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift project authors
 //
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 

Sources/SwiftDriver/Execution/ArgsResolver.swift

@@ -1,12 +1,14 @@
-//===--------------- ArgsResolver.swift - Argument Resolution -------------===//
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
 //
-// This source file is part of the Swift.org open source project
+// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0
 //
-// Copyright (c) 2020 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift project authors
 //
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 

Sources/SwiftDriver/Execution/DriverExecutor.swift

@@ -1,12 +1,14 @@
-//===--------------- DriverExecutor.swift - Swift Driver Executor----------===//
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
 //
-// This source file is part of the Swift.org open source project
+// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0
 //
-// Copyright (c) 2020 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift project authors
 //
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 

Sources/SwiftDriver/Execution/ParsableOutput.swift

@@ -1,12 +1,14 @@
-//===--------------- ParseableOutput.swift - Swift Parseable Output -------===//
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
 //
-// This source file is part of the Swift.org open source project
+// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0
 //
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift project authors
 //
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
 

Sources/SwiftDriver/Execution/ProcessProtocol.swift

@@ -1,12 +1,14 @@
-//===--------------- ProessProtocol.swift - Swift Subprocesses ------------===//
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
 //
-// This source file is part of the Swift.org open source project
+// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0
 //
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift project authors
 //
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+// SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//