[gn build] re-run "gn format" with trunk gn

Author: nico

llvm/utils/gn/build/symlink_or_copy.gni

@@ -10,9 +10,7 @@ template("symlink_or_copy") {
     # https://github.com/ninja-build/ninja/issues/1186
     stamp =
         "$target_gen_dir/" + get_path_info(invoker.output, "file") + ".stamp"
-    outputs = [
-      stamp,
-    ]
+    outputs = [ stamp ]
     script = "//llvm/utils/gn/build/symlink_or_copy.py"
     args = [
       "--stamp",

llvm/utils/gn/build/toolchain/BUILD.gn

@@ -18,29 +18,23 @@ template("unix_toolchain") {
       command = "$cc -MMD -MF $depfile -o {{output}} -c {{source}} {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}}"
       depsformat = "gcc"
       description = "CC {{output}}"
-      outputs = [
-        "{{source_out_dir}}/{{label_name}}.{{source_name_part}}.o",
-      ]
+      outputs = [ "{{source_out_dir}}/{{label_name}}.{{source_name_part}}.o" ]
     }
 
     tool("cxx") {
       depfile = "{{output}}.d"
       command = "$cxx -MMD -MF $depfile -o {{output}} -c {{source}} {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}}"
       depsformat = "gcc"
       description = "CXX {{output}}"
-      outputs = [
-        "{{source_out_dir}}/{{label_name}}.{{source_name_part}}.o",
-      ]
+      outputs = [ "{{source_out_dir}}/{{label_name}}.{{source_name_part}}.o" ]
     }
 
     tool("asm") {
       depfile = "{{output}}.d"
       command = "$cc -MMD -MF $depfile -o {{output}} -c {{source}} {{defines}} {{include_dirs}} {{asmflags}}"
       depsformat = "gcc"
       description = "ASM {{output}}"
-      outputs = [
-        "{{source_out_dir}}/{{label_name}}.{{source_name_part}}.o",
-      ]
+      outputs = [ "{{source_out_dir}}/{{label_name}}.{{source_name_part}}.o" ]
     }
 
     tool("alink") {
@@ -53,9 +47,7 @@ template("unix_toolchain") {
             "rm -f {{output}} && $ar rcsD {{arflags}} {{output}} {{inputs}}"
       }
       description = "AR {{output}}"
-      outputs = [
-        "{{output_dir}}/{{target_output_name}}.a",
-      ]
+      outputs = [ "{{output_dir}}/{{target_output_name}}.a" ]
       output_prefix = "lib"
       default_output_dir = "{{root_out_dir}}/lib"
     }
@@ -70,9 +62,7 @@ template("unix_toolchain") {
         default_output_extension = ".so"
       }
       description = "SOLINK $outfile"
-      outputs = [
-        outfile,
-      ]
+      outputs = [ outfile ]
       lib_switch = "-l"
       output_prefix = "lib"
       default_output_dir = "{{root_out_dir}}/lib"
@@ -88,9 +78,7 @@ template("unix_toolchain") {
         default_output_extension = ".so"
       }
       description = "SOLINK $outfile"
-      outputs = [
-        outfile,
-      ]
+      outputs = [ outfile ]
       lib_switch = "-l"
       default_output_dir = "{{root_out_dir}}/lib"
     }
@@ -103,9 +91,7 @@ template("unix_toolchain") {
         command = "$ld {{ldflags}} -o $outfile {{libs}} -Wl,--start-group {{inputs}} -Wl,--end-group"
       }
       description = "LINK $outfile"
-      outputs = [
-        outfile,
-      ]
+      outputs = [ outfile ]
       lib_switch = "-l"
 
       # Setting this allows targets to override the default executable output by
@@ -237,26 +223,20 @@ toolchain("win") {
     command = "$cl /nologo /showIncludes /Fo{{output}} /c {{source}} {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}}"
     depsformat = "msvc"
     description = "CC {{output}}"
-    outputs = [
-      "{{source_out_dir}}/{{label_name}}.{{source_name_part}}.obj",
-    ]
+    outputs = [ "{{source_out_dir}}/{{label_name}}.{{source_name_part}}.obj" ]
   }
 
   tool("cxx") {
     command = "$cl /nologo /showIncludes /Fo{{output}} /c {{source}} {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}}"
     depsformat = "msvc"
     description = "CXX {{output}}"
-    outputs = [
-      "{{source_out_dir}}/{{label_name}}.{{source_name_part}}.obj",
-    ]
+    outputs = [ "{{source_out_dir}}/{{label_name}}.{{source_name_part}}.obj" ]
   }
 
   tool("alink") {
     command = "$link /lib /nologo {{arflags}} /out:{{output}} {{inputs}}"
     description = "LIB {{output}}"
-    outputs = [
-      "{{output_dir}}/{{target_output_name}}.lib",
-    ]
+    outputs = [ "{{output_dir}}/{{target_output_name}}.lib" ]
     default_output_dir = "{{root_out_dir}}/lib"
   }
 
@@ -294,9 +274,7 @@ toolchain("win") {
     pdbfile = "$outprefix.pdb"
     command = "$link /nologo /dll {{ldflags}} /out:$dllfile /pdb:$pdbfile {{libs}} {{inputs}}"
     description = "LINK_MODULE $dllfile"
-    outputs = [
-      dllfile,
-    ]
+    outputs = [ dllfile ]
     lib_switch = ""
     runtime_outputs = outputs
     default_output_extension = ".dll"
@@ -310,9 +288,7 @@ toolchain("win") {
     pdbfile = "$outprefix.pdb"
     command = "$link /nologo {{ldflags}} /out:$outfile /pdb:$pdbfile {{libs}} {{inputs}}"
     description = "LINK $outfile"
-    outputs = [
-      outfile,
-    ]
+    outputs = [ outfile ]
     lib_switch = ""
     default_output_extension = ".exe"
 

llvm/utils/gn/build/write_cmake_config.gni

@@ -30,12 +30,8 @@ template("write_cmake_config") {
   action(target_name) {
     script = "//llvm/utils/gn/build/write_cmake_config.py"
 
-    sources = [
-      invoker.input,
-    ]
-    outputs = [
-      invoker.output,
-    ]
+    sources = [ invoker.input ]
+    outputs = [ invoker.output ]
     args = [
              "-o",
              rebase_path(outputs[0], root_build_dir),

llvm/utils/gn/build/write_vcsrevision.gni

@@ -41,9 +41,7 @@ template("write_vcsrevision") {
       args += [ "--name=$name" ]
     }
 
-    outputs = [
-      header,
-    ]
+    outputs = [ header ]
 
     forward_variables_from(invoker,
                            [

llvm/utils/gn/secondary/BUILD.gn

@@ -51,64 +51,40 @@ group("default") {
 # new locations).
 # That seems simpler, more explicit, and good enough.
 group("clang") {
-  deps = [
-    "//clang/tools/driver:symlinks",
-  ]
+  deps = [ "//clang/tools/driver:symlinks" ]
 }
 group("lld") {
-  deps = [
-    "//lld/tools/lld:symlinks",
-  ]
+  deps = [ "//lld/tools/lld:symlinks" ]
 }
 group("llvm-ar") {
-  deps = [
-    "//llvm/tools/llvm-ar:symlinks",
-  ]
+  deps = [ "//llvm/tools/llvm-ar:symlinks" ]
 }
 group("llvm-dwp") {
-  deps = [
-    "//llvm/tools/llvm-dwp:symlinks",
-  ]
+  deps = [ "//llvm/tools/llvm-dwp:symlinks" ]
 }
 group("llvm-nm") {
-  deps = [
-    "//llvm/tools/llvm-nm:symlinks",
-  ]
+  deps = [ "//llvm/tools/llvm-nm:symlinks" ]
 }
 group("llvm-cxxfilt") {
-  deps = [
-    "//llvm/tools/llvm-cxxfilt:symlinks",
-  ]
+  deps = [ "//llvm/tools/llvm-cxxfilt:symlinks" ]
 }
 group("llvm-objcopy") {
-  deps = [
-    "//llvm/tools/llvm-objcopy:symlinks",
-  ]
+  deps = [ "//llvm/tools/llvm-objcopy:symlinks" ]
 }
 group("llvm-objdump") {
-  deps = [
-    "//llvm/tools/llvm-objdump:symlinks",
-  ]
+  deps = [ "//llvm/tools/llvm-objdump:symlinks" ]
 }
 group("llvm-readobj") {
-  deps = [
-    "//llvm/tools/llvm-readobj:symlinks",
-  ]
+  deps = [ "//llvm/tools/llvm-readobj:symlinks" ]
 }
 group("llvm-size") {
-  deps = [
-    "//llvm/tools/llvm-size:symlinks",
-  ]
+  deps = [ "//llvm/tools/llvm-size:symlinks" ]
 }
 group("llvm-strings") {
-  deps = [
-    "//llvm/tools/llvm-strings:symlinks",
-  ]
+  deps = [ "//llvm/tools/llvm-strings:symlinks" ]
 }
 group("llvm-symbolizer") {
-  deps = [
-    "//llvm/tools/llvm-symbolizer:symlinks",
-  ]
+  deps = [ "//llvm/tools/llvm-symbolizer:symlinks" ]
 }
 
 # A pool called "console" in the root BUILD.gn is magic and represents ninja's

llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn

@@ -95,17 +95,13 @@ action("check-clangd") {
     rebase_path(get_path_info(clangd_lit_unit_site_cfg_file, "dir"),
                 root_out_dir),
   ]
-  outputs = [
-    "$target_gen_dir/run-lit",  # Non-existing, so that ninja runs it each time.
-  ]
+  outputs = [ "$target_gen_dir/run-lit" ]  # Non-existing, so that ninja runs it each time.
 
   # Since check-clangd is always dirty, //:default doesn't depend on it so
   # that it's not part of the default ninja target.  Hence, check-clangd
   # shouldn't have any deps except :test. so that the default target is sure to
   # build all the deps.
-  deps = [
-    ":test",
-  ]
+  deps = [ ":test" ]
   testonly = true
 
   pool = "//:console"

llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/framework/BUILD.gn

@@ -21,27 +21,15 @@ write_cmake_config("XPCServiceInfo.plist") {
 }
 
 bundle_data("clangxpc_bundle_xpc_service_info_plist") {
-  public_deps = [
-    ":XPCServiceInfo.plist",
-  ]
-  sources = [
-    "$target_gen_dir/XPCServiceInfo.plist",
-  ]
-  outputs = [
-    "{{bundle_contents_dir}}/Info.plist",
-  ]
+  public_deps = [ ":XPCServiceInfo.plist" ]
+  sources = [ "$target_gen_dir/XPCServiceInfo.plist" ]
+  outputs = [ "{{bundle_contents_dir}}/Info.plist" ]
 }
 
 bundle_data("clangxpc_bundle_xpc_service_executable") {
-  public_deps = [
-    "//clang-tools-extra/clangd/tool:clangd",
-  ]
-  sources = [
-    "$root_out_dir/bin/clangd",
-  ]
-  outputs = [
-    "{{bundle_executable_dir}}/{{source_file_part}}",
-  ]
+  public_deps = [ "//clang-tools-extra/clangd/tool:clangd" ]
+  sources = [ "$root_out_dir/bin/clangd" ]
+  outputs = [ "{{bundle_executable_dir}}/{{source_file_part}}" ]
 }
 
 create_bundle("clangd.xpc") {
@@ -68,49 +56,29 @@ write_cmake_config("Info.plist") {
 }
 
 bundle_data("clangdxpc_bundle_info_plist") {
-  public_deps = [
-    ":Info.plist",
-  ]
-  sources = [
-    "$target_gen_dir/Info.plist",
-  ]
-  outputs = [
-    "{{bundle_resources_dir}}/{{source_file_part}}",
-  ]
+  public_deps = [ ":Info.plist" ]
+  sources = [ "$target_gen_dir/Info.plist" ]
+  outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
 }
 
 shared_library("ClangdXPCLib") {
-  deps = [
-    "//clang-tools-extra/clangd/tool:clangd",
-  ]
+  deps = [ "//clang-tools-extra/clangd/tool:clangd" ]
   sources = [
     # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
     "ClangdXPC.cpp",
   ]
 }
 
 bundle_data("clangdxpc_bundle_executable") {
-  public_deps = [
-    ":ClangdXPCLib",
-  ]
-  sources = [
-    "$root_out_dir/lib/libClangdXPCLib.dylib",
-  ]
-  outputs = [
-    "{{bundle_executable_dir}}/ClangdXPC",
-  ]
+  public_deps = [ ":ClangdXPCLib" ]
+  sources = [ "$root_out_dir/lib/libClangdXPCLib.dylib" ]
+  outputs = [ "{{bundle_executable_dir}}/ClangdXPC" ]
 }
 
 bundle_data("clangdxpc_bundle_xpc") {
-  public_deps = [
-    ":clangd.xpc",
-  ]
-  sources = [
-    "$target_gen_dir/clangd.xpc",
-  ]
-  outputs = [
-    "{{bundle_contents_dir}}/XPCServices/{{source_file_part}}",
-  ]
+  public_deps = [ ":clangd.xpc" ]
+  sources = [ "$target_gen_dir/clangd.xpc" ]
+  outputs = [ "{{bundle_contents_dir}}/XPCServices/{{source_file_part}}" ]
 }
 
 # .framework bundle symlinks:

llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn

@@ -98,17 +98,13 @@ action("check-clang-tools") {
         rebase_path(clang_tools_extra_lit_unit_site_cfg_file, root_out_dir),
     rebase_path(".", root_out_dir),
   ]
-  outputs = [
-    "$target_gen_dir/run-lit",  # Non-existing, so that ninja runs it each time.
-  ]
+  outputs = [ "$target_gen_dir/run-lit" ]  # Non-existing, so that ninja runs it each time.
 
   # Since check-clang-tools is always dirty, //:default doesn't depend on it so
   # that it's not part of the default ninja target.  Hence, check-clang-tools
   # shouldn't have any deps except :test. so that the default target is sure to
   # build all the deps.
-  deps = [
-    ":test",
-  ]
+  deps = [ ":test" ]
   testonly = true
 
   pool = "//:console"