commit 50f917e929a56ab0ac9bc800228bf256205843d8
author Dmitri Gribenko <dmitrig@google.com> Mon Jul 17 07:51:46 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jul 17 07:53:38 2023 -0700
tree e630685ac1e041b23a5d7693b83ceb30783fdf84
parent c003cbdf40d8fc51705280636ebc2319e3b4a3a0

Fix ClangTidy warnings, mark intentionally-nontrivial functions as such

PiperOrigin-RevId: 548689376
Change-Id: Ife4f731fb860ca14902a4ce5885dcc159d31ca34

rs_bindings_from_cc/test/struct/constructors/constructors.cc

diff --git a/rs_bindings_from_cc/test/struct/constructors/constructors.cc b/rs_bindings_from_cc/test/struct/constructors/constructors.cc
index cecb913..d19407f 100644
--- a/rs_bindings_from_cc/test/struct/constructors/constructors.cc
+++ b/rs_bindings_from_cc/test/struct/constructors/constructors.cc
@@ -4,6 +4,10 @@
 
 #include "rs_bindings_from_cc/test/struct/constructors/constructors.h"
 
+namespace {
+void IntentionallyNontrivial() {}
+}  // namespace
+
 StructWithUserProvidedConstructors::StructWithUserProvidedConstructors()
     : int_field(42) {}
 
@@ -27,4 +31,6 @@
 NonTrivialStructWithConstructors::NonTrivialStructWithConstructors(int i)
     : int_field(i) {}
 
-NonTrivialStructWithConstructors::~NonTrivialStructWithConstructors() {}
+NonTrivialStructWithConstructors::~NonTrivialStructWithConstructors() {
+  IntentionallyNontrivial();
+}

rs_bindings_from_cc/test/struct/operators/add.cc

diff --git a/rs_bindings_from_cc/test/struct/operators/add.cc b/rs_bindings_from_cc/test/struct/operators/add.cc
index 56a25d0..e9898bf 100644
--- a/rs_bindings_from_cc/test/struct/operators/add.cc
+++ b/rs_bindings_from_cc/test/struct/operators/add.cc
@@ -4,6 +4,8 @@
 
 #include "rs_bindings_from_cc/test/struct/operators/add.h"
 
+#include <cstdint>
+
 UnpinStructByConstRef operator+(const UnpinStructByConstRef& lhs,
                                 const UnpinStructByConstRef& rhs) {
   return UnpinStructByConstRef{lhs.i + rhs.i};

rs_bindings_from_cc/test/struct/operators/add.h

diff --git a/rs_bindings_from_cc/test/struct/operators/add.h b/rs_bindings_from_cc/test/struct/operators/add.h
index 9acb62e..3636a01 100644
--- a/rs_bindings_from_cc/test/struct/operators/add.h
+++ b/rs_bindings_from_cc/test/struct/operators/add.h
@@ -9,6 +9,8 @@
 
 #pragma clang lifetime_elision
 
+inline void IntentionallyNontrivial() {}
+
 struct AddableConstMemberInt final {
   // impl Add<i32> for &AddableConstMemberInt { type Output = i32; .. }
   int operator+(int rhs) const { return i + rhs; }
@@ -71,7 +73,7 @@
 };
 
 struct AddableNontrivialByValue final {
-  ~AddableNontrivialByValue() {}
+  ~AddableNontrivialByValue() { IntentionallyNontrivial(); }
   AddableNontrivialByValue operator+(AddableNontrivialByValue rhs) const {
     return AddableNontrivialByValue{i + rhs.i};
   }
@@ -147,7 +149,7 @@
 };
 
 struct AddableReturnsNontrivial final {
-  ~AddableReturnsNontrivial() {}
+  ~AddableReturnsNontrivial() { IntentionallyNontrivial(); }
   AddableReturnsNontrivial operator+(
       const AddableReturnsNontrivial& rhs) const {
     return AddableReturnsNontrivial{i + rhs.i};