Fix merge and format errors

Author: frederick-vs-ja

libcxx/test/libcxx/header_inclusions.gen.py

@@ -22,7 +22,9 @@
 )
 
 for header in public_headers:
-    header_guard = lambda h: f"_LIBCPP_{str(h).upper().replace('.', '_').replace('/', '_')}"
+    header_guard = (
+        lambda h: f"_LIBCPP_{str(h).upper().replace('.', '_').replace('/', '_')}"
+    )
 
     # <cassert> has no header guards
     if header == "cassert":

libcxx/utils/libcxx/header_information.py

@@ -92,7 +92,7 @@ def has_cxx20_module(self) -> bool:
         experimental headers.
         """
         # These headers have been removed in C++20 so are never part of a module.
-        removed_in_20 = ["ccomplex", "ciso646", "cstdbool", "ctgmath"]
+        removed_in_20 = ["ccomplex", "ciso646", "cstdalign", "cstdbool", "ctgmath"]
         return self.is_public() and not self.is_experimental() and not self.is_C_compatibility() and not self._name in removed_in_20
 
     def is_in_modulemap(self) -> bool: