Clean up and pass sanity checker

Author: Lukasa

CONTRIBUTORS.txt

@@ -0,0 +1,18 @@
+For the purpose of tracking copyright, this is the list of individuals and
+organizations who have contributed source code to SwiftNIO.
+
+For employees of an organization/company where the copyright of work done
+by employees of that company is held by the company itself, only the company
+needs to be listed here.
+
+## COPYRIGHT HOLDERS
+
+- Apple Inc. (all contributors with '@apple.com')
+
+### Contributors
+
+- Cory Benfield <lukasa@apple.com>
+
+**Updating this list**
+
+Please do not edit this file manually. It is generated using `./scripts/generate_contributors_list.sh`. If a name is misspelled or appearing multiple times: add an entry in `./.mailmap`

Tests/StructuredHeadersTests/StructuredFieldDecoderTests.swift

@@ -1,4 +1,3 @@
-import CodableStructuredHeaders
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the SwiftNIO open source project
@@ -12,6 +11,7 @@ import CodableStructuredHeaders
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import CodableStructuredHeaders
 import Foundation
 import StructuredHeaders
 import XCTest

Tests/StructuredHeadersTests/StructuredFieldEncoderTests.swift

@@ -1,4 +1,3 @@
-import CodableStructuredHeaders
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the SwiftNIO open source project
@@ -12,6 +11,7 @@ import CodableStructuredHeaders
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import CodableStructuredHeaders
 import Foundation
 import StructuredHeaders
 import XCTest

scripts/check_no_api_breakages.sh

@@ -7,7 +7,7 @@
 ## Licensed under Apache License v2.0
 ##
 ## See LICENSE.txt for license information
-## See CONTRIBUTORS.md for the list of SwiftNIO project authors
+## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
 ##
 ## SPDX-License-Identifier: Apache-2.0
 ##

scripts/generate_contributors_list.sh

@@ -7,7 +7,7 @@
 ## Licensed under Apache License v2.0
 ##
 ## See LICENSE.txt for license information
-## See CONTRIBUTORS.md for the list of SwiftNIO project authors
+## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
 ##
 ## SPDX-License-Identifier: Apache-2.0
 ##
@@ -17,7 +17,7 @@ set -eu
 here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 contributors=$( cd "$here"/.. && git shortlog -es | cut -f2 | sed 's/^/- /' )
 
-cat > "$here/../CONTRIBUTORS.md" <<- EOF
+cat > "$here/../CONTRIBUTORS.txt" <<- EOF
 	For the purpose of tracking copyright, this is the list of individuals and
 	organizations who have contributed source code to SwiftNIO.
 
@@ -33,8 +33,7 @@ cat > "$here/../CONTRIBUTORS.md" <<- EOF
 
 	$contributors
 
-	## Updating this list
+	**Updating this list**
 
-	Please do not edit this file manually. It is generated using \`./scripts/generate_contributors_list.sh\`.
-    If a name is misspelled or appearing multiple times: add an entry in \`./.mailmap\` (see [docs](https://git-scm.com/docs/git-shortlog#_mapping_authors))
+	Please do not edit this file manually. It is generated using \`./scripts/generate_contributors_list.sh\`. If a name is misspelled or appearing multiple times: add an entry in \`./.mailmap\`
 EOF

scripts/generate_docs.sh

@@ -7,7 +7,7 @@
 ## Licensed under Apache License v2.0
 ##
 ## See LICENSE.txt for license information
-## See CONTRIBUTORS.md for the list of SwiftNIO project authors
+## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
 ##
 ## SPDX-License-Identifier: Apache-2.0
 ##

scripts/sanity.sh

@@ -7,7 +7,7 @@
 ## Licensed under Apache License v2.0
 ##
 ## See LICENSE.txt for license information
-## See CONTRIBUTORS.md for the list of SwiftNIO project authors
+## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
 ##
 ## SPDX-License-Identifier: Apache-2.0
 ##
@@ -56,7 +56,7 @@ for language in swift-or-c bash dtrace; do
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
-// See CONTRIBUTORS.md for the list of SwiftNIO project authors
+// See CONTRIBUTORS.txt for the list of SwiftNIO project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -75,7 +75,7 @@ EOF
 ## Licensed under Apache License v2.0
 ##
 ## See LICENSE.txt for license information
-## See CONTRIBUTORS.md for the list of SwiftNIO project authors
+## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
 ##
 ## SPDX-License-Identifier: Apache-2.0
 ##
@@ -94,7 +94,7 @@ EOF
  *  Licensed under Apache License v2.0
  *
  *  See LICENSE.txt for license information
- *  See CONTRIBUTORS.md for the list of SwiftNIO project authors
+ *  See CONTRIBUTORS.txt for the list of SwiftNIO project authors
  *
  *  SPDX-License-Identifier: Apache-2.0
  *