commit 39752aaea33a9bac70ca9bf3bed65bc7c81aecdd
author Mike Kruskal <mkruskal@google.com> Tue Oct 17 16:58:29 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Oct 17 17:00:47 2023 -0700
tree 82148b471f41077ab083e7f4105120a0219c8250
parent cb86ad6d81913e4357e21171f9e301608a5aa09f

Clean up conformance tests warnings and formatting.

PiperOrigin-RevId: 574304654

conformance/conformance_test.h

diff --git a/conformance/conformance_test.h b/conformance/conformance_test.h
index 0e3fb70..bdc7a69 100644
--- a/conformance/conformance_test.h
+++ b/conformance/conformance_test.h
@@ -14,13 +14,15 @@
 #ifndef CONFORMANCE_CONFORMANCE_TEST_H
 #define CONFORMANCE_CONFORMANCE_TEST_H
 
-#include <functional>
+#include <cstddef>
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "google/protobuf/util/type_resolver.h"
 #include "absl/container/btree_set.h"
 #include "absl/container/flat_hash_set.h"
+#include "absl/strings/string_view.h"
 #include "conformance/conformance.pb.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/wire_format_lite.h"
@@ -204,7 +206,7 @@
       return request_;
     }
 
-    const ConformanceLevel GetLevel() const { return level_; }
+    ConformanceLevel GetLevel() const { return level_; }
 
     std::string ConformanceLevelToString(ConformanceLevel level) const;
 
@@ -245,9 +247,9 @@
                       bool need_report_success, bool require_same_wire_format);
 
   void TruncateDebugPayload(std::string* payload);
-  const conformance::ConformanceRequest TruncateRequest(
+  conformance::ConformanceRequest TruncateRequest(
       const conformance::ConformanceRequest& request);
-  const conformance::ConformanceResponse TruncateResponse(
+  conformance::ConformanceResponse TruncateResponse(
       const conformance::ConformanceResponse& response);
 
   void ReportSuccess(const std::string& test_name);