From 201f63be325008d294d890166ef2507284c43477 Mon Sep 17 00:00:00 2001 From: Durham Goode Date: Wed, 26 Aug 2020 12:24:53 -0700 Subject: [PATCH] build: rename third-party rust fbthrift crate Summary: Our internal build infra creates a workspace and workspaces don't like it when two crates have the same name. Eden scm had third-party rust crates that were simple redirects to the internal location, but had the same name. This caused breakages once these crates became part of the edenfs open source build. Let's rename them to avoid this issue. Reviewed By: kulshrax Differential Revision: D23252539 fbshipit-source-id: 9ff2fa160a19c6bc54e015c71f9da7044ce659a7 --- eden/scm/lib/edenfs-client/Cargo.toml | 2 +- eden/scm/lib/third-party/rust/fbthrift/Cargo.toml | 2 +- eden/scm/lib/third-party/rust/fbthrift_socket/Cargo.toml | 2 +- eden/scm/lib/thrift-types/Cargo.toml | 2 +- eden/scm/lib/thrift-types/build.rs | 2 +- eden/scm/lib/thrift-types/eden/Cargo.toml | 2 +- eden/scm/lib/thrift-types/eden_config/Cargo.toml | 2 +- eden/scm/lib/thrift-types/fb303/Cargo.toml | 2 +- eden/scm/lib/thrift-types/fb303_core/Cargo.toml | 2 +- eden/scm/lib/thrift-types/hgclient_conf/Cargo.toml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eden/scm/lib/edenfs-client/Cargo.toml b/eden/scm/lib/edenfs-client/Cargo.toml index 52d9638e44..32f99c9f9a 100644 --- a/eden/scm/lib/edenfs-client/Cargo.toml +++ b/eden/scm/lib/edenfs-client/Cargo.toml @@ -15,7 +15,7 @@ tokio-core = "0.1" tokio-uds = "0.1" [target.'cfg(unix)'.dependencies] -fbthrift_socket = { path = "../third-party/rust/fbthrift_socket" } +fbthrift_socket = { package = "fbthrift_socket_eden_oss", path = "../third-party/rust/fbthrift_socket" } [dev-dependencies] telemetry = { path = "../../../../scm/telemetry/telemetry" } diff --git a/eden/scm/lib/third-party/rust/fbthrift/Cargo.toml b/eden/scm/lib/third-party/rust/fbthrift/Cargo.toml index cec98f52f5..c911192af6 100644 --- a/eden/scm/lib/third-party/rust/fbthrift/Cargo.toml +++ b/eden/scm/lib/third-party/rust/fbthrift/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "fbthrift" +name = "fbthrift_eden_oss" edition = "2018" version = "0.0.0" include = ["lib.rs"] diff --git a/eden/scm/lib/third-party/rust/fbthrift_socket/Cargo.toml b/eden/scm/lib/third-party/rust/fbthrift_socket/Cargo.toml index 5ad86a4f63..4ebe581846 100644 --- a/eden/scm/lib/third-party/rust/fbthrift_socket/Cargo.toml +++ b/eden/scm/lib/third-party/rust/fbthrift_socket/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "fbthrift_socket" +name = "fbthrift_socket_eden_oss" edition = "2018" version = "0.0.0" include = ["lib.rs"] diff --git a/eden/scm/lib/thrift-types/Cargo.toml b/eden/scm/lib/thrift-types/Cargo.toml index 9dd482337f..4d0a105ed5 100644 --- a/eden/scm/lib/thrift-types/Cargo.toml +++ b/eden/scm/lib/thrift-types/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] anyhow = "1" async-trait = "0.1" -fbthrift = { path = "../third-party/rust/fbthrift" } +fbthrift = { package = "fbthrift_eden_oss", path = "../third-party/rust/fbthrift" } futures = "0.3" thiserror = "1" diff --git a/eden/scm/lib/thrift-types/build.rs b/eden/scm/lib/thrift-types/build.rs index ddf3f95a1a..2c44d3bdb9 100644 --- a/eden/scm/lib/thrift-types/build.rs +++ b/eden/scm/lib/thrift-types/build.rs @@ -90,7 +90,7 @@ edition = "2018" [dependencies] anyhow = "1" async-trait = "0.1" -fbthrift = {{ path = "../../third-party/rust/fbthrift" }} +fbthrift = {{ package = "fbthrift_eden_oss", path = "../../third-party/rust/fbthrift" }} futures = "0.3" serde = {{ version = "1", features = ["derive"] }} serde_derive = "1.0" diff --git a/eden/scm/lib/thrift-types/eden/Cargo.toml b/eden/scm/lib/thrift-types/eden/Cargo.toml index 01375c387a..b0f3000c22 100644 --- a/eden/scm/lib/thrift-types/eden/Cargo.toml +++ b/eden/scm/lib/thrift-types/eden/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] anyhow = "1" async-trait = "0.1" -fbthrift = { path = "../../third-party/rust/fbthrift" } +fbthrift = { package = "fbthrift_eden_oss", path = "../../third-party/rust/fbthrift" } futures = "0.3" serde = { version = "1", features = ["derive"] } serde_derive = "1.0" diff --git a/eden/scm/lib/thrift-types/eden_config/Cargo.toml b/eden/scm/lib/thrift-types/eden_config/Cargo.toml index 15e8ddaeef..3776225698 100644 --- a/eden/scm/lib/thrift-types/eden_config/Cargo.toml +++ b/eden/scm/lib/thrift-types/eden_config/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] anyhow = "1" async-trait = "0.1" -fbthrift = { path = "../../third-party/rust/fbthrift" } +fbthrift = { package = "fbthrift_eden_oss", path = "../../third-party/rust/fbthrift" } futures = "0.3" serde = { version = "1", features = ["derive"] } serde_derive = "1.0" diff --git a/eden/scm/lib/thrift-types/fb303/Cargo.toml b/eden/scm/lib/thrift-types/fb303/Cargo.toml index 64a4bad113..33761502de 100644 --- a/eden/scm/lib/thrift-types/fb303/Cargo.toml +++ b/eden/scm/lib/thrift-types/fb303/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] anyhow = "1" async-trait = "0.1" -fbthrift = { path = "../../third-party/rust/fbthrift" } +fbthrift = { package = "fbthrift_eden_oss", path = "../../third-party/rust/fbthrift" } futures = "0.3" serde = { version = "1", features = ["derive"] } serde_derive = "1.0" diff --git a/eden/scm/lib/thrift-types/fb303_core/Cargo.toml b/eden/scm/lib/thrift-types/fb303_core/Cargo.toml index d7f3514f0d..2396341c64 100644 --- a/eden/scm/lib/thrift-types/fb303_core/Cargo.toml +++ b/eden/scm/lib/thrift-types/fb303_core/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] anyhow = "1" async-trait = "0.1" -fbthrift = { path = "../../third-party/rust/fbthrift" } +fbthrift = { package = "fbthrift_eden_oss", path = "../../third-party/rust/fbthrift" } futures = "0.3" serde = { version = "1", features = ["derive"] } serde_derive = "1.0" diff --git a/eden/scm/lib/thrift-types/hgclient_conf/Cargo.toml b/eden/scm/lib/thrift-types/hgclient_conf/Cargo.toml index 2b69becec6..6935a69bee 100644 --- a/eden/scm/lib/thrift-types/hgclient_conf/Cargo.toml +++ b/eden/scm/lib/thrift-types/hgclient_conf/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] anyhow = "1" async-trait = "0.1" -fbthrift = { path = "../../third-party/rust/fbthrift" } +fbthrift = { package = "fbthrift_eden_oss", path = "../../third-party/rust/fbthrift" } futures = "0.3" serde = { version = "1", features = ["derive"] } serde_derive = "1.0"