Merge remote-tracking branch 'upstream/master' into reorg_util

.clang-tidy

@@ -79,19 +79,16 @@ Checks: '-*,
   -bugprone-multi-level-implicit-pointer-conversion,
   -bugprone-narrowing-conversions,
   -bugprone-not-null-terminated-result,
-  -bugprone-optional-value-conversion,
   -bugprone-reserved-identifier,
   -bugprone-signed-char-misuse,
   -bugprone-sizeof-expression,
   -bugprone-switch-missing-default-case,
   -bugprone-too-small-loop-variable,
   -bugprone-unchecked-optional-access,
   -bugprone-unused-local-non-trivial-variable,
-  -bugprone-unused-return-value,
   google-*,
   -google-readability-casting,
   -google-runtime-int,
-  -google-runtime-references,
   performance-*,
   -performance-avoid-endl,
   -performance-enum-size,
@@ -133,6 +130,7 @@ Checks: '-*,
   modernize-use-noexcept,
   modernize-use-nullptr,
   modernize-use-override,
+  modernize-use-starts-ends-with,
   modernize-use-transparent-functors,
   readability-braces-around-statements,
   readability-const-return-type,
@@ -142,27 +140,27 @@ Checks: '-*,
   readability-duplicate-include,
   readability-function-size,
   readability-inconsistent-declaration-parameter-name,
+  readability-math-missing-parentheses,
   readability-misleading-indentation,
   readability-misplaced-array-index,
   readability-redundant-access-specifiers,
   readability-redundant-control-flow,
   readability-redundant-function-ptr-dereference,
   readability-redundant-smartptr-get,
-  -readability-redundant-string-cstr,
   readability-redundant-string-init,
   readability-simplify-boolean-expr,
   readability-static-definition-in-anonymous-namespace,
   readability-string-compare,
   readability-uniqueptr-delete-release'
 WarningsAsErrors: '*'
 CheckOptions:
-  - key:    readability-function-size.StatementThreshold
+  - key:    bugprone-unused-return-value.AllowCastToVoid
+    value:  true
+  - key:    readability-braces-around-statements.ShortStatementLines
     value:  '450'
+  - key:    readability-simplify-boolean-expr.SimplifyDeMorgan
+    value:  false
   - key:    modernize-make-unique.MakeSmartPtrFunction
     value:  'absl::make_unique'
   - key:    modernize-make-unique.MakeSmartPtrFunctionHeader
     value:  'absl/memory/memory.h'
-  - key:    readability-braces-around-statements.ShortStatementLines
-    value:  1
-  - key:    readability-simplify-boolean-expr.SimplifyDeMorgan
-    value:  false