From cf617255398240b4632fbb7c62aefdacb7a48c41 Mon Sep 17 00:00:00 2001 From: Chris Watkins Date: Mon, 27 Nov 2017 03:25:18 +0000 Subject: [PATCH] Run clang-tidy modernize-use-equals-{delete,default} on //sql modernize-use-equals-delete marks unimplemented and private special member functions with "= delete". This more clearly communicates intent and improves error messages. modernize-use-equals-default rewrites special member functions whose behavior matches the default, with "= default". This: * Greatly simplifies copy and move constructors, and copy assign and move assign operators because the members don't need to be manually written. * In some cases allows classes that were previously non-aggregates or non-trivial to become aggregates or trivial. Explicitly writing an empty body for default constructor disqualifies it from being trivial. Trivial classes and member functions can be better optimized by the compiler and library (via type traits). * Lets the defaulted functions and constructors to be constexpr if the implicit version would have been. * More clearly communicates intent, especially to distinguish member functions that aren't customized against those that are. This change was done using clang-tidy as described here: https://chromium.googlesource.com/chromium/src/+/lkcr/docs/clang_tidy.md In some cases the the tool leaves behind a string of commas where it replaced a member initializer list (https://bugs.llvm.org/show_bug.cgi?id=35051). Clean them up with: git diff --name-only | \ xargs sed -E -i 's/(^\s*|\)\s*):[ ,]*= default/\1 = default/' See the relevant cxx post for more details: https://groups.google.com/a/chromium.org/forum/#!topic/cxx/RkOHzIK6Tq8 BUG=778959,778957 Change-Id: I0fb961bb4ba00befba4da08fa7fc625080b46fee Reviewed-on: https://chromium-review.googlesource.com/790031 Reviewed-by: Victor Costan Commit-Queue: Victor Costan Cr-Commit-Position: refs/heads/master@{#519209} --- sql/connection_memory_dump_provider.cc | 2 +- sql/connection_unittest.cc | 2 +- sql/meta_table.cc | 3 +-- sql/sql_memory_dump_provider.cc | 4 ++-- sql/test/sql_test_base.cc | 6 ++---- sql/test/sql_test_suite.cc | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/sql/connection_memory_dump_provider.cc b/sql/connection_memory_dump_provider.cc index 5eecf71cb647ab..a789a73ad97053 100644 --- a/sql/connection_memory_dump_provider.cc +++ b/sql/connection_memory_dump_provider.cc @@ -17,7 +17,7 @@ ConnectionMemoryDumpProvider::ConnectionMemoryDumpProvider( const std::string& name) : db_(db), connection_name_(name) {} -ConnectionMemoryDumpProvider::~ConnectionMemoryDumpProvider() {} +ConnectionMemoryDumpProvider::~ConnectionMemoryDumpProvider() = default; void ConnectionMemoryDumpProvider::ResetDatabase() { base::AutoLock lock(lock_); diff --git a/sql/connection_unittest.cc b/sql/connection_unittest.cc index c4187f190e3bc1..800e775c94aea3 100644 --- a/sql/connection_unittest.cc +++ b/sql/connection_unittest.cc @@ -60,7 +60,7 @@ class ScopedMockTimeSource { MockTimeSource(ScopedMockTimeSource& owner) : owner_(owner) { } - ~MockTimeSource() override {} + ~MockTimeSource() override = default; base::TimeTicks Now() override { base::TimeTicks ret(owner_.current_time_); diff --git a/sql/meta_table.cc b/sql/meta_table.cc index c9cdb24b38210e..9628eb5c024bc3 100644 --- a/sql/meta_table.cc +++ b/sql/meta_table.cc @@ -58,8 +58,7 @@ namespace sql { MetaTable::MetaTable() : db_(NULL) { } -MetaTable::~MetaTable() { -} +MetaTable::~MetaTable() = default; // static constexpr int64_t MetaTable::kMmapFailure; diff --git a/sql/sql_memory_dump_provider.cc b/sql/sql_memory_dump_provider.cc index bb6d81306c000c..133a830c5c3474 100644 --- a/sql/sql_memory_dump_provider.cc +++ b/sql/sql_memory_dump_provider.cc @@ -17,9 +17,9 @@ SqlMemoryDumpProvider* SqlMemoryDumpProvider::GetInstance() { base::LeakySingletonTraits>::get(); } -SqlMemoryDumpProvider::SqlMemoryDumpProvider() {} +SqlMemoryDumpProvider::SqlMemoryDumpProvider() = default; -SqlMemoryDumpProvider::~SqlMemoryDumpProvider() {} +SqlMemoryDumpProvider::~SqlMemoryDumpProvider() = default; bool SqlMemoryDumpProvider::OnMemoryDump( const base::trace_event::MemoryDumpArgs& args, diff --git a/sql/test/sql_test_base.cc b/sql/test/sql_test_base.cc index 52930bb3490fe1..3eabb564cba596 100644 --- a/sql/test/sql_test_base.cc +++ b/sql/test/sql_test_base.cc @@ -9,11 +9,9 @@ namespace sql { -SQLTestBase::SQLTestBase() { -} +SQLTestBase::SQLTestBase() = default; -SQLTestBase::~SQLTestBase() { -} +SQLTestBase::~SQLTestBase() = default; base::FilePath SQLTestBase::db_path() { return temp_dir_.GetPath().AppendASCII("SQLTest.db"); diff --git a/sql/test/sql_test_suite.cc b/sql/test/sql_test_suite.cc index 0dace7419a0b94..e7743280bfdd8f 100644 --- a/sql/test/sql_test_suite.cc +++ b/sql/test/sql_test_suite.cc @@ -12,7 +12,7 @@ namespace sql { SQLTestSuite::SQLTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} -SQLTestSuite::~SQLTestSuite() {} +SQLTestSuite::~SQLTestSuite() = default; void SQLTestSuite::Initialize() { base::TestSuite::Initialize();