[internal] Move bazel_protos to the top level, since they are not pro…

…cess_execution specifc. (#12228) Moves the `bazel_protos` crate to the top level, since it is depended on by a few different crates that are oblivious to process execution, including the `fs/store` crate.
pantsbuild · Jun 18, 2021 · 8824cc3 · 8824cc3
1 parent 0607381
commit 8824cc3
Show file tree

Hide file tree

Showing 48 changed files with 9 additions and 9 deletions.
diff --git a/...gine/process_execution/bazel_protos/BUILD → src/rust/engine/bazel_protos/BUILD b/...gine/process_execution/bazel_protos/BUILD → src/rust/engine/bazel_protos/BUILD
diff --git a/...process_execution/bazel_protos/Cargo.toml → src/rust/engine/bazel_protos/Cargo.toml b/...process_execution/bazel_protos/Cargo.toml → src/rust/engine/bazel_protos/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 
 [dependencies]
 bytes = "1.0"
-hashing = { path = "../../hashing" }
+hashing = { path = "../hashing" }
 prost = "0.7"
 prost-build = "0.7"
 prost-types = "0.7"

diff --git a/...e/process_execution/bazel_protos/build.rs → src/rust/engine/bazel_protos/build.rs b/...e/process_execution/bazel_protos/build.rs → src/rust/engine/bazel_protos/build.rs
diff --git a/...tos/protos/bazelbuild_remote-apis/LICENSE → ...tos/protos/bazelbuild_remote-apis/LICENSE b/...tos/protos/bazelbuild_remote-apis/LICENSE → ...tos/protos/bazelbuild_remote-apis/LICENSE
diff --git a/...s/protos/bazelbuild_remote-apis/README.md → ...s/protos/bazelbuild_remote-apis/README.md b/...s/protos/bazelbuild_remote-apis/README.md → ...s/protos/bazelbuild_remote-apis/README.md
diff --git a/...emote/execution/v2/remote_execution.proto → ...emote/execution/v2/remote_execution.proto b/...emote/execution/v2/remote_execution.proto → ...emote/execution/v2/remote_execution.proto
diff --git a/...mote-apis/build/bazel/semver/semver.proto → ...mote-apis/build/bazel/semver/semver.proto b/...mote-apis/build/bazel/semver/semver.proto → ...mote-apis/build/bazel/semver/semver.proto
diff --git a/...ion/bazel_protos/protos/buildbarn/LICENSE → ...ine/bazel_protos/protos/buildbarn/LICENSE b/...ion/bazel_protos/protos/buildbarn/LICENSE → ...ine/bazel_protos/protos/buildbarn/LICENSE
diff --git a/...n/bazel_protos/protos/buildbarn/README.md → ...e/bazel_protos/protos/buildbarn/README.md b/...n/bazel_protos/protos/buildbarn/README.md → ...e/bazel_protos/protos/buildbarn/README.md
diff --git a/...n/bazel_protos/protos/buildbarn/cas.proto → ...e/bazel_protos/protos/buildbarn/cas.proto b/...n/bazel_protos/protos/buildbarn/cas.proto → ...e/bazel_protos/protos/buildbarn/cas.proto
diff --git a/...on/bazel_protos/protos/googleapis/LICENSE → ...ne/bazel_protos/protos/googleapis/LICENSE b/...on/bazel_protos/protos/googleapis/LICENSE → ...ne/bazel_protos/protos/googleapis/LICENSE
diff --git a/.../bazel_protos/protos/googleapis/README.md → .../bazel_protos/protos/googleapis/README.md b/.../bazel_protos/protos/googleapis/README.md → .../bazel_protos/protos/googleapis/README.md
diff --git a/...s/googleapis/google/api/annotations.proto → ...s/googleapis/google/api/annotations.proto b/...s/googleapis/google/api/annotations.proto → ...s/googleapis/google/api/annotations.proto
diff --git a/...s/protos/googleapis/google/api/http.proto → ...s/protos/googleapis/google/api/http.proto b/...s/protos/googleapis/google/api/http.proto → ...s/protos/googleapis/google/api/http.proto
diff --git a/...leapis/google/bytestream/bytestream.proto → ...leapis/google/bytestream/bytestream.proto b/...leapis/google/bytestream/bytestream.proto → ...leapis/google/bytestream/bytestream.proto
diff --git a/...eapis/google/longrunning/operations.proto → ...eapis/google/longrunning/operations.proto b/...eapis/google/longrunning/operations.proto → ...eapis/google/longrunning/operations.proto
diff --git a/...s/protos/googleapis/google/rpc/code.proto → ...s/protos/googleapis/google/rpc/code.proto b/...s/protos/googleapis/google/rpc/code.proto → ...s/protos/googleapis/google/rpc/code.proto
diff --git a/...googleapis/google/rpc/error_details.proto → ...googleapis/google/rpc/error_details.proto b/...googleapis/google/rpc/error_details.proto → ...googleapis/google/rpc/error_details.proto
diff --git a/...protos/googleapis/google/rpc/status.proto → ...protos/googleapis/google/rpc/status.proto b/...protos/googleapis/google/rpc/status.proto → ...protos/googleapis/google/rpc/status.proto
diff --git a/...l_protos/protos/rust-protobuf/LICENSE.txt → ...l_protos/protos/rust-protobuf/LICENSE.txt b/...l_protos/protos/rust-protobuf/LICENSE.txt → ...l_protos/protos/rust-protobuf/LICENSE.txt
diff --git a/...zel_protos/protos/rust-protobuf/README.md → ...zel_protos/protos/rust-protobuf/README.md b/...zel_protos/protos/rust-protobuf/README.md → ...zel_protos/protos/rust-protobuf/README.md
diff --git a/...otos/protos/rust-protobuf/rustproto.proto → ...otos/protos/rust-protobuf/rustproto.proto b/...otos/protos/rust-protobuf/rustproto.proto → ...otos/protos/rust-protobuf/rustproto.proto
diff --git a/...tion/bazel_protos/protos/standard/LICENSE → ...gine/bazel_protos/protos/standard/LICENSE b/...tion/bazel_protos/protos/standard/LICENSE → ...gine/bazel_protos/protos/standard/LICENSE
diff --git a/...on/bazel_protos/protos/standard/README.md → ...ne/bazel_protos/protos/standard/README.md b/...on/bazel_protos/protos/standard/README.md → ...ne/bazel_protos/protos/standard/README.md
diff --git a/...protos/standard/google/protobuf/any.proto → ...protos/standard/google/protobuf/any.proto b/...protos/standard/google/protobuf/any.proto → ...protos/standard/google/protobuf/any.proto
diff --git a/...protos/standard/google/protobuf/api.proto → ...protos/standard/google/protobuf/api.proto b/...protos/standard/google/protobuf/api.proto → ...protos/standard/google/protobuf/api.proto
diff --git a/...standard/google/protobuf/descriptor.proto → ...standard/google/protobuf/descriptor.proto b/...standard/google/protobuf/descriptor.proto → ...standard/google/protobuf/descriptor.proto
diff --git a/...s/standard/google/protobuf/duration.proto → ...s/standard/google/protobuf/duration.proto b/...s/standard/google/protobuf/duration.proto → ...s/standard/google/protobuf/duration.proto
diff --git a/...otos/standard/google/protobuf/empty.proto → ...otos/standard/google/protobuf/empty.proto b/...otos/standard/google/protobuf/empty.proto → ...otos/standard/google/protobuf/empty.proto
diff --git a/...standard/google/protobuf/field_mask.proto → ...standard/google/protobuf/field_mask.proto b/...standard/google/protobuf/field_mask.proto → ...standard/google/protobuf/field_mask.proto
diff --git a/...dard/google/protobuf/source_context.proto → ...dard/google/protobuf/source_context.proto b/...dard/google/protobuf/source_context.proto → ...dard/google/protobuf/source_context.proto
diff --git a/...tos/standard/google/protobuf/struct.proto → ...tos/standard/google/protobuf/struct.proto b/...tos/standard/google/protobuf/struct.proto → ...tos/standard/google/protobuf/struct.proto
diff --git a/.../standard/google/protobuf/timestamp.proto → .../standard/google/protobuf/timestamp.proto b/.../standard/google/protobuf/timestamp.proto → .../standard/google/protobuf/timestamp.proto
diff --git a/...rotos/standard/google/protobuf/type.proto → ...rotos/standard/google/protobuf/type.proto b/...rotos/standard/google/protobuf/type.proto → ...rotos/standard/google/protobuf/type.proto
diff --git a/...s/standard/google/protobuf/wrappers.proto → ...s/standard/google/protobuf/wrappers.proto b/...s/standard/google/protobuf/wrappers.proto → ...s/standard/google/protobuf/wrappers.proto
diff --git a/...execution/bazel_protos/src/conversions.rs → ...st/engine/bazel_protos/src/conversions.rs b/...execution/bazel_protos/src/conversions.rs → ...st/engine/bazel_protos/src/conversions.rs
diff --git a/...ion/bazel_protos/src/conversions_tests.rs → ...ine/bazel_protos/src/conversions_tests.rs b/...ion/bazel_protos/src/conversions_tests.rs → ...ine/bazel_protos/src/conversions_tests.rs
diff --git a/...process_execution/bazel_protos/src/lib.rs → src/rust/engine/bazel_protos/src/lib.rs b/...process_execution/bazel_protos/src/lib.rs → src/rust/engine/bazel_protos/src/lib.rs
diff --git a/...xecution/bazel_protos/src/verification.rs → ...t/engine/bazel_protos/src/verification.rs b/...xecution/bazel_protos/src/verification.rs → ...t/engine/bazel_protos/src/verification.rs
diff --git a/...on/bazel_protos/src/verification_tests.rs → ...ne/bazel_protos/src/verification_tests.rs b/...on/bazel_protos/src/verification_tests.rs → ...ne/bazel_protos/src/verification_tests.rs
diff --git a/src/rust/engine/fs/brfs/Cargo.toml b/src/rust/engine/fs/brfs/Cargo.toml
@@ -6,7 +6,7 @@ authors = [ "Pants Build <pantsbuild@gmail.com>" ]
 publish = false
 
 [dependencies]
-bazel_protos = { path = "../../process_execution/bazel_protos" }
+bazel_protos = { path = "../../bazel_protos" }
 clap = "2"
 dirs-next = "2"
 env_logger = "0.5.4"

diff --git a/src/rust/engine/fs/fs_util/Cargo.toml b/src/rust/engine/fs/fs_util/Cargo.toml
@@ -6,7 +6,7 @@ authors = [ "Pants Build <pantsbuild@gmail.com>" ]
 publish = false
 
 [dependencies]
-bazel_protos = { path = "../../process_execution/bazel_protos" }
+bazel_protos = { path = "../../bazel_protos" }
 bytes = "1.0"
 clap = "2"
 env_logger = "0.5.4"

diff --git a/src/rust/engine/fs/store/Cargo.toml b/src/rust/engine/fs/store/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 async-stream = "0.3"
 async-trait = "0.1"
-bazel_protos = { path = "../../process_execution/bazel_protos" }
+bazel_protos = { path = "../../bazel_protos" }
 bytes = "1.0"
 concrete_time = { path = "../../concrete_time" }
 grpc_util = { path = "../../grpc_util" }

diff --git a/src/rust/engine/process_execution/Cargo.toml b/src/rust/engine/process_execution/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 async-trait = "0.1"
 walkdir = "2"
 async_semaphore = { path = "../async_semaphore" }
-bazel_protos = { path = "bazel_protos" }
+bazel_protos = { path = "../bazel_protos" }
 bytes = "1.0"
 derivative = "2.1.1"
 grpc_util = { path = "../grpc_util" }

diff --git a/src/rust/engine/process_executor/Cargo.toml b/src/rust/engine/process_executor/Cargo.toml
@@ -6,7 +6,7 @@ authors = [ "Pants Build <pantsbuild@gmail.com>" ]
 publish = false
 
 [dependencies]
-bazel_protos = { path = "../process_execution/bazel_protos" }
+bazel_protos = { path = "../bazel_protos" }
 clap = "2"
 dirs-next = "2"
 env_logger = "0.5.4"

diff --git a/src/rust/engine/testutil/Cargo.toml b/src/rust/engine/testutil/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 
 [dependencies]
 async-stream = "0.3"
-bazel_protos = { path = "../process_execution/bazel_protos" }
+bazel_protos = { path = "../bazel_protos" }
 bytes = "1.0"
 grpc_util = { path = "../grpc_util" }
 fs = { path = "../fs" }

diff --git a/src/rust/engine/testutil/local_execution_server/Cargo.toml b/src/rust/engine/testutil/local_execution_server/Cargo.toml
@@ -6,7 +6,7 @@ authors = [ "Pants Build <pantsbuild@gmail.com>" ]
 publish = false
 
 [dependencies]
-bazel_protos = { path = "../../process_execution/bazel_protos" }
+bazel_protos = { path = "../../bazel_protos" }
 mock = { path = "../mock" }
 clap = "2"
 structopt = "0.2.18"

diff --git a/src/rust/engine/testutil/mock/Cargo.toml b/src/rust/engine/testutil/mock/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 
 [dependencies]
 async-stream = "0.3"
-bazel_protos = { path = "../../process_execution/bazel_protos" }
+bazel_protos = { path = "../../bazel_protos" }
 bytes = "1.0"
 futures = "0.3"
 hashing = { path = "../../hashing" }