commit bcc1bae0bd0b5f9e60bacfce491bbdb294d4927a
author dan sinclair <dsinclair@google.com> Wed Aug 05 22:30:32 2020 -0400
committer GitHub <noreply@github.com> Wed Aug 05 22:30:32 2020 -0400
tree 2b918d6cf9e2593d065ce382540c68c11230a290
parent 1f468e0a45c8efab31e8ae36b97c14fd5d17d959

Update language in a few places. (#898)

This CL clarifies various bits of text.

Doxyfile

diff --git a/Doxyfile b/Doxyfile
index b216412..4b9ba52 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1336,7 +1336,7 @@
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the primary .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 

src/amberscript/parser_subgroup_size_control_test.cc

diff --git a/src/amberscript/parser_subgroup_size_control_test.cc b/src/amberscript/parser_subgroup_size_control_test.cc
index b012fd6..4358b4b 100644
--- a/src/amberscript/parser_subgroup_size_control_test.cc
+++ b/src/amberscript/parser_subgroup_size_control_test.cc
@@ -107,7 +107,7 @@
 END
 PIPELINE compute pipeline
   ATTACH test_shader
-  SUBGROUP dummy
+  SUBGROUP unused
   END
 END)";
 
@@ -167,7 +167,7 @@
 PIPELINE compute pipeline
   ATTACH test_shader
   SUBGROUP test_shader
-    REQUIRED_SIZE dummy
+    REQUIRED_SIZE unused
   END
 END)";
 
@@ -256,7 +256,7 @@
 PIPELINE compute pipeline
   ATTACH test_shader
   SUBGROUP test_shader
-    FULLY_POPULATED dummy
+    FULLY_POPULATED unused
   END
 END)";
   Parser parser;
@@ -275,7 +275,7 @@
 PIPELINE compute pipeline
   ATTACH test_shader
   SUBGROUP test_shader
-    VARYING_SIZE dummy
+    VARYING_SIZE unused
   END
 END)";
   Parser parser;

tools/check_code_format.sh

diff --git a/tools/check_code_format.sh b/tools/check_code_format.sh
index e4818f9..72a8398 100755
--- a/tools/check_code_format.sh
+++ b/tools/check_code_format.sh
@@ -18,14 +18,14 @@
 #
 # This script assumes to be invoked at the project root directory.
 
-FILES_TO_CHECK=$(git diff --name-only master | grep -E ".*\.(cpp|cc|c\+\+|cxx|c|h|hpp)$")
+FILES_TO_CHECK=$(git diff --name-only main | grep -E ".*\.(cpp|cc|c\+\+|cxx|c|h|hpp)$")
 
 if [ -z "${FILES_TO_CHECK}" ]; then
   echo "No source code to check for formatting."
   exit 0
 fi
 
-FORMAT_DIFF=$(git diff -U0 master -- ${FILES_TO_CHECK} | python ./tools/clang-format-diff.py -p1 -style=file)
+FORMAT_DIFF=$(git diff -U0 main -- ${FILES_TO_CHECK} | python ./tools/clang-format-diff.py -p1 -style=file)
 
 if [ -z "${FORMAT_DIFF}" ]; then
   echo "All source code in PR properly formatted."