Retarget dependencies from //cuttlefish/common/libs/utils:result_matchers to //cuttlefish/result:result_matchers

Databean · Databean · commit affca6c30590 · 2025-12-23T18:57:09.000Z
Generated with:
```
$ sed -i 's|cuttlefish/common/libs/utils/result_matchers.h|cuttlefish/result/result_matchers.h|g' $(find common host -type f)
$ ~/go/bin/buildozer 'replace deps //cuttlefish/common/libs/utils:result_matchers //cuttlefish/result:result_matchers' '//cuttlefish/...:*'
$ git-clang-format
```

Bug: b/471081465
diff --git a/base/cvd/cuttlefish/common/libs/key_equals_value/BUILD.bazel b/base/cvd/cuttlefish/common/libs/key_equals_value/BUILD.bazel
@@ -21,8 +21,8 @@ cf_cc_test(
     srcs = ["key_equals_value_test.cc"],
     deps = [
         "//cuttlefish/common/libs/key_equals_value",
-        "//cuttlefish/common/libs/utils:result_matchers",
         "//cuttlefish/result",
+        "//cuttlefish/result:result_matchers",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
diff --git a/base/cvd/cuttlefish/common/libs/key_equals_value/key_equals_value_test.cc b/base/cvd/cuttlefish/common/libs/key_equals_value/key_equals_value_test.cc
@@ -20,8 +20,8 @@
 #include "gmock/gmock-matchers.h"
 #include "gtest/gtest.h"
 
-#include "cuttlefish/common/libs/utils/result_matchers.h"
 #include "cuttlefish/result/result.h"
+#include "cuttlefish/result/result_matchers.h"
 
 namespace cuttlefish {
 namespace {
diff --git a/base/cvd/cuttlefish/common/libs/utils/BUILD.bazel b/base/cvd/cuttlefish/common/libs/utils/BUILD.bazel
@@ -121,8 +121,8 @@ cf_cc_test(
     deps = [
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/common/libs/utils:files_test_helper",
-        "//cuttlefish/common/libs/utils:result_matchers",
         "//cuttlefish/result",
+        "//cuttlefish/result:result_matchers",
         "//libbase",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
@@ -151,8 +151,8 @@ cf_cc_test(
     deps = [
         "//cuttlefish/common/libs/fs",
         "//cuttlefish/common/libs/utils:flag_parser",
-        "//cuttlefish/common/libs/utils:result_matchers",
         "//cuttlefish/result",
+        "//cuttlefish/result:result_matchers",
         "//libbase",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
diff --git a/base/cvd/cuttlefish/common/libs/utils/files_test.cpp b/base/cvd/cuttlefish/common/libs/utils/files_test.cpp
@@ -23,8 +23,8 @@
 #include <gtest/gtest.h>
 
 #include "cuttlefish/common/libs/utils/files_test_helper.h"
-#include "cuttlefish/common/libs/utils/result_matchers.h"
 #include "cuttlefish/result/result.h"
+#include "cuttlefish/result/result_matchers.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/common/libs/utils/flag_parser_test.cpp b/base/cvd/cuttlefish/common/libs/utils/flag_parser_test.cpp
@@ -28,7 +28,7 @@
 #include <gtest/gtest.h>
 #include <libxml/parser.h>
 
-#include "cuttlefish/common/libs/utils/result_matchers.h"
+#include "cuttlefish/result/result_matchers.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/cli/BUILD.bazel
@@ -33,8 +33,8 @@ cf_cc_test(
     name = "frontline_parser_test",
     srcs = ["frontline_parser_test.cpp"],
     deps = [
-        "//cuttlefish/common/libs/utils:result_matchers",
         "//cuttlefish/host/commands/cvd/cli:frontline_parser",
+        "//cuttlefish/result:result_matchers",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/frontline_parser_test.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/frontline_parser_test.cpp
@@ -17,8 +17,8 @@
 
 #include <gtest/gtest.h>
 
-#include "cuttlefish/common/libs/utils/result_matchers.h"
 #include "cuttlefish/host/commands/cvd/cli/frontline_parser.h"
+#include "cuttlefish/result/result_matchers.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/BUILD.bazel
@@ -88,12 +88,12 @@ cf_cc_test(
     ],
     deps = [
         "//cuttlefish/common/libs/utils:base64",
-        "//cuttlefish/common/libs/utils:result_matchers",
         "//cuttlefish/host/commands/assemble_cvd:launch_cvd_cc_proto",
         "//cuttlefish/host/commands/cvd/cli/parser",
         "//cuttlefish/host/commands/cvd/cli/parser:configs_common",
         "//cuttlefish/host/commands/cvd/cli/parser:test_common",
         "//cuttlefish/result",
+        "//cuttlefish/result:result_matchers",
         "//libbase",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/BUILD.bazel
@@ -52,12 +52,12 @@ cf_cc_test(
         "//cuttlefish/common/libs/utils:base64",
         "//cuttlefish/common/libs/utils:flag_parser",
         "//cuttlefish/common/libs/utils:json",
-        "//cuttlefish/common/libs/utils:result_matchers",
         "//cuttlefish/host/commands/assemble_cvd:launch_cvd_cc_proto",
         "//cuttlefish/host/commands/cvd/cli/parser",
         "//cuttlefish/host/commands/cvd/cli/parser:configs_common",
         "//cuttlefish/host/commands/cvd/cli/parser:test_common",
         "//cuttlefish/result",
+        "//cuttlefish/result:result_matchers",
         "//libbase",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/graphics_configs_test.cc b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/graphics_configs_test.cc
@@ -25,9 +25,9 @@
 #include "cuttlefish/common/libs/utils/base64.h"
 #include "cuttlefish/common/libs/utils/flag_parser.h"
 #include "cuttlefish/common/libs/utils/json.h"
-#include "cuttlefish/common/libs/utils/result_matchers.h"
 #include "cuttlefish/host/commands/assemble_cvd/proto/launch_cvd.pb.h"
 #include "cuttlefish/host/commands/cvd/cli/parser/test_common.h"
+#include "cuttlefish/result/result_matchers.h"
 
 using google::protobuf::Message;
 using google::protobuf::util::MessageDifferencer;
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/vm_configs_test.cc b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/vm_configs_test.cc
@@ -22,8 +22,8 @@
 #include <gtest/gtest.h>
 
 #include "cuttlefish/common/libs/utils/json.h"
-#include "cuttlefish/common/libs/utils/result_matchers.h"
 #include "cuttlefish/host/commands/cvd/cli/parser/test_common.h"
+#include "cuttlefish/result/result_matchers.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/metrics_configs_test.cc b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/metrics_configs_test.cc
@@ -20,9 +20,9 @@
 #include <gtest/gtest.h>
 #include <json/value.h>
 
-#include "cuttlefish/common/libs/utils/result_matchers.h"
 #include "cuttlefish/host/commands/cvd/cli/parser/test_common.h"
 #include "cuttlefish/result/result.h"
+#include "cuttlefish/result/result_matchers.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/selector/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/cli/selector/BUILD.bazel
@@ -39,8 +39,8 @@ cf_cc_test(
     srcs = ["host_tool_target_test.cpp"],
     deps = [
         "//cuttlefish/common/libs/utils:environment",
-        "//cuttlefish/common/libs/utils:result_matchers",
         "//cuttlefish/host/commands/cvd/cli/commands:host_tool_target",
+        "//cuttlefish/result:result_matchers",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
@@ -87,10 +87,10 @@ cf_cc_test(
     name = "parser_names_test",
     srcs = ["parser_names_test.cpp"],
     deps = [
-        "//cuttlefish/common/libs/utils:result_matchers",
         "//cuttlefish/host/commands/cvd/cli/selector:parser_names_helper",
         "//cuttlefish/host/commands/cvd/cli/selector:selector_common_parser",
         "//cuttlefish/host/commands/cvd/cli/selector:start_selector_parser",
+        "//cuttlefish/result:result_matchers",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/selector/host_tool_target_test.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/selector/host_tool_target_test.cpp
@@ -18,8 +18,8 @@
 #include <gtest/gtest.h>
 
 #include "cuttlefish/common/libs/utils/environment.h"
-#include "cuttlefish/common/libs/utils/result_matchers.h"
 #include "cuttlefish/host/commands/cvd/cli/commands/host_tool_target.h"
+#include "cuttlefish/result/result_matchers.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/selector/parser_names_test.cpp b/base/cvd/cuttlefish/host/commands/cvd/cli/selector/parser_names_test.cpp
@@ -16,10 +16,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "cuttlefish/common/libs/utils/result_matchers.h"
+#include "cuttlefish/host/commands/cvd/cli/selector/parser_names_helper.h"
 #include "cuttlefish/host/commands/cvd/cli/selector/selector_common_parser.h"
 #include "cuttlefish/host/commands/cvd/cli/selector/start_selector_parser.h"
-#include "cuttlefish/host/commands/cvd/cli/selector/parser_names_helper.h"
+#include "cuttlefish/result/result_matchers.h"
 
 namespace cuttlefish {
 namespace selector {
diff --git a/base/cvd/cuttlefish/host/commands/cvd/fetch/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/fetch/BUILD.bazel
@@ -99,10 +99,10 @@ cf_cc_test(
     srcs = ["downloaders_test.cpp"],
     deps = [
         "//cuttlefish/common/libs/utils:files",
-        "//cuttlefish/common/libs/utils:result_matchers",
         "//cuttlefish/host/commands/cvd/fetch:downloaders",
         "//cuttlefish/host/commands/cvd/fetch:fetch_cvd_parser",
         "//cuttlefish/result",
+        "//cuttlefish/result:result_matchers",
         "//libbase",
         "@fmt",
         "@googletest//:gtest",
@@ -202,9 +202,9 @@ cf_cc_test(
     name = "fetch_cvd_parser_test",
     srcs = ["fetch_cvd_parser_test.cpp"],
     deps = [
-        "//cuttlefish/common/libs/utils:result_matchers",
         "//cuttlefish/host/commands/cvd/fetch:fetch_cvd_parser",
         "//cuttlefish/result",
+        "//cuttlefish/result:result_matchers",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
diff --git a/base/cvd/cuttlefish/host/commands/cvd/fetch/downloaders_test.cpp b/base/cvd/cuttlefish/host/commands/cvd/fetch/downloaders_test.cpp
@@ -22,10 +22,10 @@
 #include "fmt/core.h"
 
 #include "cuttlefish/common/libs/utils/files.h"
-#include "cuttlefish/common/libs/utils/result_matchers.h"
 #include "cuttlefish/host/commands/cvd/fetch/downloaders.h"
 #include "cuttlefish/host/commands/cvd/fetch/fetch_cvd_parser.h"
 #include "cuttlefish/result/result.h"
+#include "cuttlefish/result/result_matchers.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_cvd_parser_test.cpp b/base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_cvd_parser_test.cpp
@@ -21,8 +21,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "cuttlefish/common/libs/utils/result_matchers.h"
 #include "cuttlefish/result/result.h"
+#include "cuttlefish/result/result_matchers.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/instances/BUILD.bazel
@@ -68,9 +68,9 @@ cf_cc_test(
     deps = [
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/common/libs/utils:json",
-        "//cuttlefish/common/libs/utils:result_matchers",
         "//cuttlefish/host/commands/cvd/instances",
         "//cuttlefish/host/commands/cvd/instances:instance_database_helper",
+        "//cuttlefish/result:result_matchers",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
@@ -136,9 +136,9 @@ cf_cc_test(
     name = "local_instance_group_test",
     srcs = ["local_instance_group_test.cpp"],
     deps = [
-        "//cuttlefish/common/libs/utils:result_matchers",
         "//cuttlefish/host/commands/cvd/instances",
         "//cuttlefish/host/commands/cvd/instances:cvd_persistent_data",
+        "//cuttlefish/result:result_matchers",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/instance_database_test.cpp b/base/cvd/cuttlefish/host/commands/cvd/instances/instance_database_test.cpp
@@ -23,10 +23,10 @@
 
 #include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/common/libs/utils/json.h"
-#include "cuttlefish/common/libs/utils/result_matchers.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_database.h"
 #include "cuttlefish/host/commands/cvd/instances/instance_database_helper.h"
 #include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
+#include "cuttlefish/result/result_matchers.h"
 
 /*
  * SetUp creates a mock ANDROID_HOST_OUT directory where there is
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/local_instance_group_test.cpp b/base/cvd/cuttlefish/host/commands/cvd/instances/local_instance_group_test.cpp
@@ -18,9 +18,9 @@
 
 #include <gtest/gtest.h>
 
-#include "cuttlefish/common/libs/utils/result_matchers.h"
 #include "cuttlefish/host/commands/cvd/instances/cvd_persistent_data.pb.h"
 #include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
+#include "cuttlefish/result/result_matchers.h"
 
 namespace cuttlefish {
 namespace selector {
diff --git a/base/cvd/cuttlefish/host/libs/web/BUILD.bazel b/base/cvd/cuttlefish/host/libs/web/BUILD.bazel
@@ -61,9 +61,9 @@ cf_cc_test(
     srcs = ["android_build_string_tests.cpp"],
     deps = [
         "//cuttlefish/common/libs/utils:flag_parser",
-        "//cuttlefish/common/libs/utils:result_matchers",
         "//cuttlefish/host/libs/web:android_build_string",
         "//cuttlefish/result",
+        "//cuttlefish/result:result_matchers",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
diff --git a/base/cvd/cuttlefish/host/libs/web/android_build_string_tests.cpp b/base/cvd/cuttlefish/host/libs/web/android_build_string_tests.cpp
@@ -23,7 +23,7 @@
 #include <gtest/gtest.h>
 
 #include "cuttlefish/common/libs/utils/flag_parser.h"
-#include "cuttlefish/common/libs/utils/result_matchers.h"
+#include "cuttlefish/result/result_matchers.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/libs/web/cas/BUILD.bazel b/base/cvd/cuttlefish/host/libs/web/cas/BUILD.bazel
@@ -30,11 +30,11 @@ cf_cc_test(
     deps = [
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/common/libs/utils:flag_parser",
-        "//cuttlefish/common/libs/utils:result_matchers",
         "//cuttlefish/host/libs/web:android_build",
         "//cuttlefish/host/libs/web/cas:cas_downloader",
         "//cuttlefish/host/libs/web/cas:cas_flags",
         "//cuttlefish/result",
+        "//cuttlefish/result:result_matchers",
         "//libbase",
         "@fmt",
         "@googletest//:gtest",
diff --git a/base/cvd/cuttlefish/host/libs/web/cas/cas_downloader_test.cpp b/base/cvd/cuttlefish/host/libs/web/cas/cas_downloader_test.cpp
@@ -33,10 +33,10 @@
 #include <gtest/gtest.h>
 
 #include "cuttlefish/common/libs/utils/files.h"
-#include "cuttlefish/common/libs/utils/result_matchers.h"
 #include "cuttlefish/host/libs/web/android_build.h"
 #include "cuttlefish/host/libs/web/cas/cas_flags.h"
 #include "cuttlefish/result/result.h"
+#include "cuttlefish/result/result_matchers.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/libs/web/http_client/BUILD.bazel b/base/cvd/cuttlefish/host/libs/web/http_client/BUILD.bazel
@@ -39,11 +39,11 @@ cf_cc_test(
     name = "fake_http_client_test",
     srcs = ["fake_http_client_test.cc"],
     deps = [
-        "//cuttlefish/common/libs/utils:result_matchers",
         "//cuttlefish/host/libs/web/http_client",
         "//cuttlefish/host/libs/web/http_client:fake_http_client",
         "//cuttlefish/host/libs/web/http_client:http_string",
         "//cuttlefish/result",
+        "//cuttlefish/result:result_matchers",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
diff --git a/base/cvd/cuttlefish/host/libs/web/http_client/fake_http_client_test.cc b/base/cvd/cuttlefish/host/libs/web/http_client/fake_http_client_test.cc
@@ -18,10 +18,10 @@
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
-#include "cuttlefish/common/libs/utils/result_matchers.h"
 #include "cuttlefish/host/libs/web/http_client/http_client.h"
 #include "cuttlefish/host/libs/web/http_client/http_string.h"
 #include "cuttlefish/result/result.h"
+#include "cuttlefish/result/result_matchers.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/libs/zip/BUILD.bazel b/base/cvd/cuttlefish/host/libs/zip/BUILD.bazel
diff --git a/base/cvd/cuttlefish/host/libs/zip/buffered_zip_source_test.cc b/base/cvd/cuttlefish/host/libs/zip/buffered_zip_source_test.cc
diff --git a/base/cvd/cuttlefish/host/libs/zip/cached_zip_source_test.cc b/base/cvd/cuttlefish/host/libs/zip/cached_zip_source_test.cc
diff --git a/base/cvd/cuttlefish/host/libs/zip/remote_zip_test.cc b/base/cvd/cuttlefish/host/libs/zip/remote_zip_test.cc
diff --git a/base/cvd/cuttlefish/host/libs/zip/serialize_disjoint_range_set_test.cc b/base/cvd/cuttlefish/host/libs/zip/serialize_disjoint_range_set_test.cc
diff --git a/base/cvd/cuttlefish/host/libs/zip/zip_copy_test.cc b/base/cvd/cuttlefish/host/libs/zip/zip_copy_test.cc
