clang-tidy braces changes (#2075)

Applies the changes in #2065, and temprarily disables the hook since it's too slow to run on a change this large. We should re-enable it in a later commit.

Author: kripken

.travis.yml

@@ -66,7 +66,7 @@ jobs:
         - mkdir -p ${BUILD_SUBDIR} && cd ${BUILD_SUBDIR}
         - cmake ${TRAVIS_BUILD_DIR} -DCMAKE_C_FLAGS="$COMPILER_FLAGS" -DCMAKE_CXX_FLAGS="$COMPILER_FLAGS" -DCMAKE_INSTALL_PREFIX=install -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
         # clang-tidy-diff.sh may not exist when BUILD_SUBDIR is a subdirectory
-        - if [ -f clang-tidy-diff.sh ]; then ./clang-tidy-diff.sh; fi
+        # XXX temporarily disable this - if [ -f clang-tidy-diff.sh ]; then ./clang-tidy-diff.sh; fi
         - make -j2 install
         - cd ${TRAVIS_BUILD_DIR}
         - ./check.py --binaryen-bin=${BUILD_SUBDIR}/install/bin

src/abi/js.h

@@ -54,10 +54,12 @@ ensureScratchMemoryHelpers(Module* wasm,
                            cashew::IString specific = cashew::IString()) {
   auto ensureImport =
     [&](Name name, const std::vector<Type> params, Type result) {
-      if (wasm->getFunctionOrNull(name))
+      if (wasm->getFunctionOrNull(name)) {
         return;
-      if (specific.is() && name != specific)
+      }
+      if (specific.is() && name != specific) {
         return;
+      }
       auto func = make_unique<Function>();
       func->name = name;
       func->params = params;