Fix import-related lint errors.

PiperOrigin-RevId: 630401772
google-parfait · May 3, 2024 · 7e13c8a · 7e13c8a
1 parent 983f1bb
commit 7e13c8a
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 19 deletions.
diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/BUILD b/tensorflow_federated/cc/core/impl/aggregation/protocol/BUILD
@@ -189,7 +189,6 @@ cc_test(
         "//tensorflow_federated/cc/core/impl/aggregation/core:tensor_cc_proto",
         "//tensorflow_federated/cc/core/impl/aggregation/testing",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:test_data",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:cord",
@@ -234,7 +233,6 @@ cc_test(
         "//tensorflow_federated/cc/core/impl/aggregation/core:tensor_cc_proto",
         "//tensorflow_federated/cc/core/impl/aggregation/testing",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:test_data",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
     ],

diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_aggregator_test.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_aggregator_test.cc
@@ -20,10 +20,10 @@
 #include <cstdint>
 #include <functional>
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
 // clang-format off
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/parse_text_proto.h"
 // clang-format on
@@ -49,6 +49,7 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/mocks.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
+#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_builder.h b/tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_builder.h
@@ -19,7 +19,6 @@
 
 #include <memory>
 #include <string>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/cord.h"

diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter.cc
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include "tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter.h"
 
 #include <string>

diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter.h b/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter.h
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_AGGREGATION_PROTOCOL_CONFIG_CONVERTER_H_
 #define THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_AGGREGATION_PROTOCOL_CONFIG_CONVERTER_H_
 

diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter_test.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter_test.cc
@@ -20,8 +20,6 @@
 #include <utility>
 #include <vector>
 
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
-
 // clang-format off
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/parse_text_proto.h"
 // clang-format on
@@ -37,6 +35,7 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/protocol/configuration.pb.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
+#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/...rflow_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_builder.cc b/...rflow_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_builder.cc
@@ -17,7 +17,6 @@
 #include <cstdint>
 #include <memory>
 #include <string>
-#include <utility>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"

diff --git a/..._federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_builder_test.cc b/..._federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_builder_test.cc
@@ -31,8 +31,9 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_builder.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_header.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
+// clang-format off
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+// clang-format on
 
 namespace tensorflow_federated::aggregation {
 namespace {

diff --git a/...w_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_parser_test.cc b/...w_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_parser_test.cc
@@ -16,7 +16,6 @@
 
 #include <cstdint>
 #include <memory>
-#include <string>
 
 #include "googlemock/include/gmock/gmock.h"
 #include "googletest/include/gtest/gtest.h"
@@ -30,7 +29,6 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/protocol/federated_compute_checkpoint_builder.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
 
 namespace tensorflow_federated::aggregation {
 namespace {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/python/aggregation_protocol.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/python/aggregation_protocol.cc
@@ -17,7 +17,6 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/protocol/aggregation_protocol.h"
 
 #include <pybind11/pybind11.h>
-
 #include <cstdint>
 #include <string>
 

diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/resource_resolver.h b/tensorflow_federated/cc/core/impl/aggregation/protocol/resource_resolver.h
@@ -17,7 +17,7 @@
 #ifndef THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_AGGREGATION_PROTOCOL_RESOURCE_RESOLVER_H_
 #define THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_AGGREGATION_PROTOCOL_RESOURCE_RESOLVER_H_
 
-#include <memory>
+#include <cstdint>
 #include <string>
 
 #include "absl/status/statusor.h"

diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/BUILD b/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/BUILD
@@ -45,6 +45,8 @@ cc_library(
     hdrs = ["cancelable_callback.h"],
     deps = [
         "//tensorflow_federated/cc/core/impl/aggregation/base:clock",
+        "@com_google_absl//absl/base:core_headers",
+        "@com_google_absl//absl/synchronization",
         "@com_google_absl//absl/time",
     ],
 )

diff --git a/...low_federated/cc/core/impl/aggregation/protocol/simple_aggregation/cancelable_callback.cc b/...low_federated/cc/core/impl/aggregation/protocol/simple_aggregation/cancelable_callback.cc
@@ -18,6 +18,8 @@
 #include <memory>
 #include <utility>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/synchronization/mutex.h"
 #include "absl/time/time.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/base/clock.h"
 

diff --git a/...rflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/latency_aggregator.h b/...rflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/latency_aggregator.h
@@ -18,6 +18,7 @@
 #define THIRD_PARTY_TENSORFLOW_FEDERATED_CC_CORE_IMPL_AGGREGATION_PROTOCOL_SIMPLE_AGGREGATION_LATENCY_AGGREGATOR_H_
 
 #include <cmath>
+#include <cstddef>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"

diff --git a/.../cc/core/impl/aggregation/protocol/simple_aggregation/simple_aggregation_protocol_test.cc b/.../cc/core/impl/aggregation/protocol/simple_aggregation/simple_aggregation_protocol_test.cc
@@ -19,19 +19,15 @@
 #include <atomic>
 #include <cstdint>
 #include <functional>
-#include <initializer_list>
 #include <memory>
-
-#include "tensorflow_federated/cc/core/impl/executors/protobuf_matchers.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
-// clang-format off
-#include "tensorflow_federated/cc/core/impl/aggregation/testing/parse_text_proto.h"
-// clang-format on
 #include <optional>
 #include <string>
 #include <utility>
 #include <vector>
 
+// clang-format off
+#include "tensorflow_federated/cc/core/impl/aggregation/testing/parse_text_proto.h"
+// clang-format on
 #include "googlemock/include/gmock/gmock.h"
 #include "googletest/include/gtest/gtest.h"
 #include "absl/status/status.h"
@@ -58,6 +54,8 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/mocks.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
+#include "tensorflow_federated/cc/core/impl/executors/protobuf_matchers.h"
+#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
 
 namespace tensorflow_federated::aggregation {
 namespace {