facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-12-24 13:34:37 +03:00
Code Issues Projects Releases Wiki Activity

build: rename third-party rust fbthrift crate

Browse Source 
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
This commit is contained in:
Durham Goode 2020-08-26 12:24:53 -07:00 committed by Facebook GitHub Bot
parent 7cfbf99de4
commit 201f63be32
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eden/scm/lib/edenfs-client/Cargo.toml
View File

@ -15,7 +15,7 @@ tokio-core = "0.1"
tokio-uds = "0.1" tokio-uds = "0.1"
[target.'cfg(unix)'.dependencies] [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] [dev-dependencies]
telemetry = { path = "../../../../scm/telemetry/telemetry" } telemetry = { path = "../../../../scm/telemetry/telemetry" }

2
eden/scm/lib/third-party/rust/fbthrift/Cargo.toml vendored
View File

@ -1,5 +1,5 @@
[package] [package]
name = "fbthrift" name = "fbthrift_eden_oss"
edition = "2018" edition = "2018"
version = "0.0.0" version = "0.0.0"
include = ["lib.rs"] include = ["lib.rs"]

2
eden/scm/lib/third-party/rust/fbthrift_socket/Cargo.toml vendored
View File

@ -1,5 +1,5 @@
[package] [package]
name = "fbthrift_socket" name = "fbthrift_socket_eden_oss"
edition = "2018" edition = "2018"
version = "0.0.0" version = "0.0.0"
include = ["lib.rs"] include = ["lib.rs"]

2
eden/scm/lib/thrift-types/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2018"
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
async-trait = "0.1" async-trait = "0.1"
fbthrift = { path = "../third-party/rust/fbthrift" } fbthrift = { package = "fbthrift_eden_oss", path = "../third-party/rust/fbthrift" }
futures = "0.3" futures = "0.3"
thiserror = "1" thiserror = "1"

2
eden/scm/lib/thrift-types/build.rs
View File

@ -90,7 +90,7 @@ edition = "2018"
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
async-trait = "0.1" async-trait = "0.1"
fbthrift = {{ path = "../../third-party/rust/fbthrift" }} fbthrift = {{ package = "fbthrift_eden_oss", path = "../../third-party/rust/fbthrift" }}
futures = "0.3" futures = "0.3"
serde = {{ version = "1", features = ["derive"] }} serde = {{ version = "1", features = ["derive"] }}
serde_derive = "1.0" serde_derive = "1.0"

2
eden/scm/lib/thrift-types/eden/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
async-trait = "0.1" async-trait = "0.1"
fbthrift = { path = "../../third-party/rust/fbthrift" } fbthrift = { package = "fbthrift_eden_oss", path = "../../third-party/rust/fbthrift" }
futures = "0.3" futures = "0.3"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_derive = "1.0" serde_derive = "1.0"

2
eden/scm/lib/thrift-types/eden_config/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
async-trait = "0.1" async-trait = "0.1"
fbthrift = { path = "../../third-party/rust/fbthrift" } fbthrift = { package = "fbthrift_eden_oss", path = "../../third-party/rust/fbthrift" }
futures = "0.3" futures = "0.3"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_derive = "1.0" serde_derive = "1.0"

2
eden/scm/lib/thrift-types/fb303/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
async-trait = "0.1" async-trait = "0.1"
fbthrift = { path = "../../third-party/rust/fbthrift" } fbthrift = { package = "fbthrift_eden_oss", path = "../../third-party/rust/fbthrift" }
futures = "0.3" futures = "0.3"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_derive = "1.0" serde_derive = "1.0"

2
eden/scm/lib/thrift-types/fb303_core/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
async-trait = "0.1" async-trait = "0.1"
fbthrift = { path = "../../third-party/rust/fbthrift" } fbthrift = { package = "fbthrift_eden_oss", path = "../../third-party/rust/fbthrift" }
futures = "0.3" futures = "0.3"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_derive = "1.0" serde_derive = "1.0"

2
eden/scm/lib/thrift-types/hgclient_conf/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
async-trait = "0.1" async-trait = "0.1"
fbthrift = { path = "../../third-party/rust/fbthrift" } fbthrift = { package = "fbthrift_eden_oss", path = "../../third-party/rust/fbthrift" }
futures = "0.3" futures = "0.3"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_derive = "1.0" serde_derive = "1.0"