From 52dc4918ca8b874ddd4e4fcad873a66ecc5b6953 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Wed, 4 Sep 2024 16:47:20 -0400 Subject: [PATCH] [libc++][NFC] Use consistent layout for license in Python files Most Python files were using `# === [...]` instead of `#=== [...]` so I went with what was the most common in the codebase. --- libcxx/test/libcxx/clang_modules_include.gen.py | 4 ++-- libcxx/test/libcxx/clang_tidy.gen.py | 4 ++-- libcxx/test/libcxx/double_include.gen.py | 4 ++-- libcxx/test/libcxx/header_inclusions.gen.py | 4 ++-- libcxx/test/libcxx/libcpp_version.gen.py | 4 ++-- libcxx/test/libcxx/no_assert_include.gen.py | 4 ++-- libcxx/test/libcxx/system_reserved_names.gen.py | 4 ++-- libcxx/test/libcxx/transitive_includes.gen.py | 4 ++-- libcxx/utils/adb_run.py | 4 ++-- libcxx/utils/ci/Dockerfile | 4 ++-- libcxx/utils/ci/apple-install-libcxx.sh | 4 ++-- libcxx/utils/ci/build-picolibc.sh | 4 ++-- libcxx/utils/ci/buildkite-pipeline.yml | 4 ++-- libcxx/utils/ci/run-buildbot | 4 ++-- libcxx/utils/ci/vendor/android/Dockerfile.emulator | 4 ++-- libcxx/utils/ci/vendor/android/build-emulator-images.sh | 4 ++-- libcxx/utils/ci/vendor/android/container-setup.sh | 4 ++-- libcxx/utils/ci/vendor/android/emulator-entrypoint.sh | 4 ++-- libcxx/utils/ci/vendor/android/emulator-functions.sh | 4 ++-- libcxx/utils/ci/vendor/android/emulator-wait-for-ready.sh | 4 ++-- libcxx/utils/ci/vendor/android/setup-env-for-emulator.sh | 4 ++-- libcxx/utils/ci/vendor/android/start-emulator.sh | 4 ++-- libcxx/utils/ci/vendor/android/stop-emulator.sh | 4 ++-- libcxx/utils/libcxx/test/android.py | 4 ++-- 24 files changed, 48 insertions(+), 48 deletions(-) diff --git a/libcxx/test/libcxx/clang_modules_include.gen.py b/libcxx/test/libcxx/clang_modules_include.gen.py index f084c38a8fbd..f0421b2e7381 100644 --- a/libcxx/test/libcxx/clang_modules_include.gen.py +++ b/libcxx/test/libcxx/clang_modules_include.gen.py @@ -1,10 +1,10 @@ -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # Test that we can include each header in a TU while using modules. # This is important notably because the LLDB data formatters use diff --git a/libcxx/test/libcxx/clang_tidy.gen.py b/libcxx/test/libcxx/clang_tidy.gen.py index 76b9db2d5cb8..5e84fbbb9913 100644 --- a/libcxx/test/libcxx/clang_tidy.gen.py +++ b/libcxx/test/libcxx/clang_tidy.gen.py @@ -1,10 +1,10 @@ -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # Run our custom libc++ clang-tidy checks on all public headers. diff --git a/libcxx/test/libcxx/double_include.gen.py b/libcxx/test/libcxx/double_include.gen.py index c7cb38b8f359..afc2947dbece 100644 --- a/libcxx/test/libcxx/double_include.gen.py +++ b/libcxx/test/libcxx/double_include.gen.py @@ -1,10 +1,10 @@ -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # Test that we can include each header in two TU's and link them together. diff --git a/libcxx/test/libcxx/header_inclusions.gen.py b/libcxx/test/libcxx/header_inclusions.gen.py index faaa4cf8710c..2ecc47cbb189 100644 --- a/libcxx/test/libcxx/header_inclusions.gen.py +++ b/libcxx/test/libcxx/header_inclusions.gen.py @@ -1,10 +1,10 @@ -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # Test that all headers include all the other headers they're supposed to, as # prescribed by the Standard. diff --git a/libcxx/test/libcxx/libcpp_version.gen.py b/libcxx/test/libcxx/libcpp_version.gen.py index 7d9519d58955..a9995295e21e 100644 --- a/libcxx/test/libcxx/libcpp_version.gen.py +++ b/libcxx/test/libcxx/libcpp_version.gen.py @@ -1,10 +1,10 @@ -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # Test that all headers define the _LIBCPP_VERSION macro. diff --git a/libcxx/test/libcxx/no_assert_include.gen.py b/libcxx/test/libcxx/no_assert_include.gen.py index dd8006df9376..67ab98603ca8 100644 --- a/libcxx/test/libcxx/no_assert_include.gen.py +++ b/libcxx/test/libcxx/no_assert_include.gen.py @@ -1,10 +1,10 @@ -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # Ensure that none of the standard C++ headers implicitly include cassert or # assert.h (because assert() is implemented as a macro). diff --git a/libcxx/test/libcxx/system_reserved_names.gen.py b/libcxx/test/libcxx/system_reserved_names.gen.py index 956a8d1abe3c..e29e7a2cdd61 100644 --- a/libcxx/test/libcxx/system_reserved_names.gen.py +++ b/libcxx/test/libcxx/system_reserved_names.gen.py @@ -1,10 +1,10 @@ -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # Test that headers are not tripped up by the surrounding code defining various # alphabetic macros. Also ensure that we don't swallow the definition of user diff --git a/libcxx/test/libcxx/transitive_includes.gen.py b/libcxx/test/libcxx/transitive_includes.gen.py index 834f21f12543..22075364bf1b 100644 --- a/libcxx/test/libcxx/transitive_includes.gen.py +++ b/libcxx/test/libcxx/transitive_includes.gen.py @@ -1,10 +1,10 @@ -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # Test that we don't remove transitive includes of public C++ headers in the library accidentally. # When we remove a transitive public include, clients tend to break because they don't always diff --git a/libcxx/utils/adb_run.py b/libcxx/utils/adb_run.py index dc15b51d7f60..cddbd191e988 100755 --- a/libcxx/utils/adb_run.py +++ b/libcxx/utils/adb_run.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## """adb_run.py is a utility for running a libc++ test program via adb. """ diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile index 490bee4942e0..dbecfd9fd332 100644 --- a/libcxx/utils/ci/Dockerfile +++ b/libcxx/utils/ci/Dockerfile @@ -1,10 +1,10 @@ -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # This file defines the buildkite and github actions builder images. # You can build both images using: diff --git a/libcxx/utils/ci/apple-install-libcxx.sh b/libcxx/utils/ci/apple-install-libcxx.sh index 1ef52b11b70b..1b1c30449d5a 100755 --- a/libcxx/utils/ci/apple-install-libcxx.sh +++ b/libcxx/utils/ci/apple-install-libcxx.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## set -e diff --git a/libcxx/utils/ci/build-picolibc.sh b/libcxx/utils/ci/build-picolibc.sh index 400e4dcab99a..521c1bef9fc7 100755 --- a/libcxx/utils/ci/build-picolibc.sh +++ b/libcxx/utils/ci/build-picolibc.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # This script builds picolibc (https://github.com/picolibc/picolibc) from diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml index d02d11ae7a75..906df734bc42 100644 --- a/libcxx/utils/ci/buildkite-pipeline.yml +++ b/libcxx/utils/ci/buildkite-pipeline.yml @@ -1,10 +1,10 @@ -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # This file describes the various pre-commit CI bots used to test libc++. diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot index 102f1669e63b..14ff61130298 100755 --- a/libcxx/utils/ci/run-buildbot +++ b/libcxx/utils/ci/run-buildbot @@ -1,11 +1,11 @@ #!/usr/bin/env bash -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## set -ex set -o pipefail diff --git a/libcxx/utils/ci/vendor/android/Dockerfile.emulator b/libcxx/utils/ci/vendor/android/Dockerfile.emulator index 2f52b27f6edc..6ce9b82d258e 100644 --- a/libcxx/utils/ci/vendor/android/Dockerfile.emulator +++ b/libcxx/utils/ci/vendor/android/Dockerfile.emulator @@ -1,10 +1,10 @@ -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## FROM ubuntu:jammy diff --git a/libcxx/utils/ci/vendor/android/build-emulator-images.sh b/libcxx/utils/ci/vendor/android/build-emulator-images.sh index f467ffc6231f..4e29c172e47e 100755 --- a/libcxx/utils/ci/vendor/android/build-emulator-images.sh +++ b/libcxx/utils/ci/vendor/android/build-emulator-images.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## set -e diff --git a/libcxx/utils/ci/vendor/android/container-setup.sh b/libcxx/utils/ci/vendor/android/container-setup.sh index 56bc232fefa1..40e405b65f83 100755 --- a/libcxx/utils/ci/vendor/android/container-setup.sh +++ b/libcxx/utils/ci/vendor/android/container-setup.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## set -e diff --git a/libcxx/utils/ci/vendor/android/emulator-entrypoint.sh b/libcxx/utils/ci/vendor/android/emulator-entrypoint.sh index 99d4995b2ee1..dcd7870e37a7 100755 --- a/libcxx/utils/ci/vendor/android/emulator-entrypoint.sh +++ b/libcxx/utils/ci/vendor/android/emulator-entrypoint.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # This script is the entrypoint of an Android Emulator Docker container. diff --git a/libcxx/utils/ci/vendor/android/emulator-functions.sh b/libcxx/utils/ci/vendor/android/emulator-functions.sh index 27eea2af157c..56770654989d 100644 --- a/libcxx/utils/ci/vendor/android/emulator-functions.sh +++ b/libcxx/utils/ci/vendor/android/emulator-functions.sh @@ -1,10 +1,10 @@ -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # Bash functions for managing the names of emulator system images. diff --git a/libcxx/utils/ci/vendor/android/emulator-wait-for-ready.sh b/libcxx/utils/ci/vendor/android/emulator-wait-for-ready.sh index 0c3579479289..73b657cb1433 100755 --- a/libcxx/utils/ci/vendor/android/emulator-wait-for-ready.sh +++ b/libcxx/utils/ci/vendor/android/emulator-wait-for-ready.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## set -ex diff --git a/libcxx/utils/ci/vendor/android/setup-env-for-emulator.sh b/libcxx/utils/ci/vendor/android/setup-env-for-emulator.sh index 7de6cde7a7ad..a822b26ffe6f 100644 --- a/libcxx/utils/ci/vendor/android/setup-env-for-emulator.sh +++ b/libcxx/utils/ci/vendor/android/setup-env-for-emulator.sh @@ -1,10 +1,10 @@ -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## export ADB_SERVER_SOCKET="tcp:$(docker inspect \ -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' \ diff --git a/libcxx/utils/ci/vendor/android/start-emulator.sh b/libcxx/utils/ci/vendor/android/start-emulator.sh index 2d6e272675ea..bec8048e5c5f 100755 --- a/libcxx/utils/ci/vendor/android/start-emulator.sh +++ b/libcxx/utils/ci/vendor/android/start-emulator.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # Starts a new Docker container using a Docker image containing the Android # Emulator and an OS image. Stops and removes the old container if it exists diff --git a/libcxx/utils/ci/vendor/android/stop-emulator.sh b/libcxx/utils/ci/vendor/android/stop-emulator.sh index b5797ccb344f..4964fcf20450 100755 --- a/libcxx/utils/ci/vendor/android/stop-emulator.sh +++ b/libcxx/utils/ci/vendor/android/stop-emulator.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## set -e diff --git a/libcxx/utils/libcxx/test/android.py b/libcxx/utils/libcxx/test/android.py index a40305b4dca0..4536c9b15682 100644 --- a/libcxx/utils/libcxx/test/android.py +++ b/libcxx/utils/libcxx/test/android.py @@ -1,10 +1,10 @@ -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # -#===----------------------------------------------------------------------===## +# ===----------------------------------------------------------------------===## import re import select