cpplint: Remove many unnecessary NOLINT
Now that we updated to upstream cpplint, a lot of these NOLINTs are no
longer necessary.
Bug: 68951293
Change-Id: If8ed5ffe89727f313f907a214b6d8fd2a2eddbad
diff --git a/compiler/debug/dwarf/dwarf_test.cc b/compiler/debug/dwarf/dwarf_test.cc
index 866bf43..933034f 100644
--- a/compiler/debug/dwarf/dwarf_test.cc
+++ b/compiler/debug/dwarf/dwarf_test.cc
@@ -125,7 +125,7 @@
WriteCIE(is64bit, Reg(is64bit ? 16 : 8),
initial_opcodes, kCFIFormat, &debug_frame_data_);
std::vector<uintptr_t> debug_frame_patches;
- std::vector<uintptr_t> expected_patches { 28 }; // NOLINT
+ std::vector<uintptr_t> expected_patches = { 28 };
WriteFDE(is64bit, 0, 0, 0x01000000, 0x01000000, ArrayRef<const uint8_t>(*opcodes.data()),
kCFIFormat, 0, &debug_frame_data_, &debug_frame_patches);
@@ -140,7 +140,7 @@
initial_opcodes, kCFIFormat, &debug_frame_data_);
DebugFrameOpCodeWriter<> opcodes;
std::vector<uintptr_t> debug_frame_patches;
- std::vector<uintptr_t> expected_patches { 32 }; // NOLINT
+ std::vector<uintptr_t> expected_patches = { 32 };
WriteFDE(is64bit, 0, 0, 0x0100000000000000, 0x0200000000000000,
ArrayRef<const uint8_t>(*opcodes.data()),
kCFIFormat, 0, &debug_frame_data_, &debug_frame_patches);
@@ -237,7 +237,7 @@
DW_CHECK_NEXT("1\t0\t1000\t2000\tfile.c");
std::vector<uintptr_t> debug_line_patches;
- std::vector<uintptr_t> expected_patches { 87 }; // NOLINT
+ std::vector<uintptr_t> expected_patches = { 87 };
WriteDebugLineTable(include_directories, files, opcodes,
0, &debug_line_data_, &debug_line_patches);
@@ -275,7 +275,7 @@
EXPECT_LT(opcodes.data()->size(), num_rows * 3);
std::vector<std::string> directories;
- std::vector<FileEntry> files { { "file.c", 0, 1000, 2000 } }; // NOLINT
+ std::vector<FileEntry> files = { { "file.c", 0, 1000, 2000 } };
std::vector<uintptr_t> debug_line_patches;
WriteDebugLineTable(directories, files, opcodes,
0, &debug_line_data_, &debug_line_patches);
@@ -333,7 +333,7 @@
DW_CHECK("3 DW_TAG_compile_unit [no children]");
std::vector<uintptr_t> debug_info_patches;
- std::vector<uintptr_t> expected_patches { 16, 20, 29, 33, 42, 46 }; // NOLINT
+ std::vector<uintptr_t> expected_patches = { 16, 20, 29, 33, 42, 46 };
dwarf::WriteDebugInfoCU(0 /* debug_abbrev_offset */, info,
0, &debug_info_data_, &debug_info_patches);
diff --git a/compiler/driver/compiler_options_map-storage.h b/compiler/driver/compiler_options_map-storage.h
index 756598d..01f32e0 100644
--- a/compiler/driver/compiler_options_map-storage.h
+++ b/compiler/driver/compiler_options_map-storage.h
@@ -36,7 +36,7 @@
#define COMPILER_OPTIONS_KEY(Type, Name, ...) \
template <typename Base, template <typename TV> class KeyType> \
- const KeyType<Type> CompilerOptionsMap<Base, KeyType>::Name {__VA_ARGS__}; // NOLINT [readability/braces] [4]
+ const KeyType<Type> CompilerOptionsMap<Base, KeyType>::Name {__VA_ARGS__};
#include <driver/compiler_options_map.def>
template struct CompilerOptionsMap<COMPILER_OPTIONS_MAP_TYPE, COMPILER_OPTIONS_MAP_KEY_TYPE>;
diff --git a/compiler/optimizing/induction_var_analysis_test.cc b/compiler/optimizing/induction_var_analysis_test.cc
index f87b46d..4c11ad4 100644
--- a/compiler/optimizing/induction_var_analysis_test.cc
+++ b/compiler/optimizing/induction_var_analysis_test.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <regex> // NOLINT [build/c++11] [5]
+#include <regex>
#include "base/arena_allocator.h"
#include "builder.h"
diff --git a/compiler/utils/intrusive_forward_list_test.cc b/compiler/utils/intrusive_forward_list_test.cc
index 939676c..e97c304 100644
--- a/compiler/utils/intrusive_forward_list_test.cc
+++ b/compiler/utils/intrusive_forward_list_test.cc
@@ -574,11 +574,11 @@
ref.remove(4);
ifl.remove(4);
ASSERT_LISTS_EQUAL(ref, ifl);
- auto odd = [](ValueType value) { return (value.value & 1) != 0; }; // NOLINT(readability/braces)
+ auto odd = [](ValueType value) { return (value.value & 1) != 0; };
ref.remove_if(odd);
ifl.remove_if(odd);
ASSERT_LISTS_EQUAL(ref, ifl);
- auto all = [](ValueType value ATTRIBUTE_UNUSED) { return true; }; // NOLINT(readability/braces)
+ auto all = [](ValueType value ATTRIBUTE_UNUSED) { return true; };
ref.remove_if(all);
ifl.remove_if(all);
ASSERT_LISTS_EQUAL(ref, ifl);
@@ -721,7 +721,7 @@
ListType ifl(storage.begin(), storage.end());
ASSERT_LISTS_EQUAL(ref, ifl);
- auto add1 = [](const ValueType& value) { return value.value + 1; }; // NOLINT [readability/braces]
+ auto add1 = [](const ValueType& value) { return value.value + 1; };
std::transform(ref.begin(), ref.end(), ref.begin(), add1);
std::transform(ifl.begin(), ifl.end(), ifl.begin(), add1);
ASSERT_LISTS_EQUAL(ref, ifl);
diff --git a/compiler/utils/swap_space.h b/compiler/utils/swap_space.h
index 08e243b..2280f8b 100644
--- a/compiler/utils/swap_space.h
+++ b/compiler/utils/swap_space.h
@@ -124,7 +124,7 @@
explicit SwapAllocator(SwapSpace* swap_space) : swap_space_(swap_space) {}
template <typename U>
- SwapAllocator(const SwapAllocator<U>& other) // NOLINT, implicit
+ SwapAllocator(const SwapAllocator<U>& other)
: swap_space_(other.swap_space_) {}
SwapAllocator(const SwapAllocator& other) = default;
@@ -160,7 +160,7 @@
explicit SwapAllocator(SwapSpace* swap_space) : swap_space_(swap_space) {}
template <typename U>
- SwapAllocator(const SwapAllocator<U>& other) // NOLINT, implicit
+ SwapAllocator(const SwapAllocator<U>& other)
: swap_space_(other.swap_space_) {}
SwapAllocator(const SwapAllocator& other) = default;
diff --git a/compiler/utils/x86/assembler_x86_test.cc b/compiler/utils/x86/assembler_x86_test.cc
index e232add..36c5c3c 100644
--- a/compiler/utils/x86/assembler_x86_test.cc
+++ b/compiler/utils/x86/assembler_x86_test.cc
@@ -90,7 +90,7 @@
}
if (registers_.size() == 0) {
registers_.insert(end(registers_),
- { // NOLINT(whitespace/braces)
+ {
new x86::Register(x86::EAX),
new x86::Register(x86::EBX),
new x86::Register(x86::ECX),
@@ -104,7 +104,7 @@
if (fp_registers_.size() == 0) {
fp_registers_.insert(end(fp_registers_),
- { // NOLINT(whitespace/braces)
+ {
new x86::XmmRegister(x86::XMM0),
new x86::XmmRegister(x86::XMM1),
new x86::XmmRegister(x86::XMM2),