facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-04 13:57:13 +03:00
Code Issues Projects Releases Wiki Activity

eliminate rerun_c dependence on brotli-decompressor

Browse Source 
Summary:
the diff eliminates dependencies on brotli-3.3.4 and brotli-decompressor-2.3.5.

the reason is for the avoidance of duplicate symbols that result from combining targets that depend on `fbsoure//third-party/rust:brotli_decompression` (e.g. `rerun_c` via `ureq`) AND `fbsource//third-party/brotli:brotli_decode` (e.g. `fbsource//third-party/apache-arrow:arrow`).

with these changes in place then remove occurrences of the link flag `"/FORCE:MULTIPLE"` introduced by D56797954 and D56821592 to work around this problem.

Reviewed By: jdonald

Differential Revision: D56943460

fbshipit-source-id: b38d69503f6be85a2055a89da2a161d114030c4c
This commit is contained in:
Shayne Fletcher 2024-05-06 15:12:46 -07:00 committed by Facebook GitHub Bot
parent d7e01e93a4
commit 352a79c30c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eden/mononoke/git/git_types/Cargo.toml
View File

@ -46,7 +46,7 @@ tokio = { version = "1.37.0", features = ["full", "test-util", "tracing"] }
unodes = { version = "0.1.0", path = "../../derived_data/unodes" }
[dev-dependencies]
async-compression = { version = "0.4.1", features = ["brotli", "bzip2", "deflate", "futures-io", "gzip", "tokio", "zlib", "zstd", "zstdmt"] }
async-compression = { version = "0.4.9", features = ["brotli", "bzip2", "deflate", "futures-io", "gzip", "tokio", "zlib", "zstd", "zstdmt"] }
bonsai_hg_mapping = { version = "0.1.0", path = "../../bonsai_hg_mapping" }
bookmarks = { version = "0.1.0", path = "../../bookmarks" }
changesets = { version = "0.1.0", path = "../../changesets" }

2
eden/mononoke/gotham_ext/Cargo.toml
View File

@ -9,7 +9,7 @@ license = "GPLv2+"
[dependencies]
anyhow = "1.0.75"
async-compression = { version = "0.4.1", features = ["brotli", "bzip2", "deflate", "futures-io", "gzip", "tokio", "zlib", "zstd", "zstdmt"] }
async-compression = { version = "0.4.9", features = ["brotli", "bzip2", "deflate", "futures-io", "gzip", "tokio", "zlib", "zstd", "zstdmt"] }
async-trait = "0.1.71"
bytes = { version = "1.6.0", features = ["serde"] }
cached_config = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }

2
eden/mononoke/mercurial/bundles/Cargo.toml
View File

@ -9,7 +9,7 @@ license = "GPLv2+"
[dependencies]
anyhow = "1.0.75"
async-compression = { version = "0.4.1", features = ["brotli", "bzip2", "deflate", "futures-io", "gzip", "tokio", "zlib", "zstd", "zstdmt"] }
async-compression = { version = "0.4.9", features = ["brotli", "bzip2", "deflate", "futures-io", "gzip", "tokio", "zlib", "zstd", "zstdmt"] }
async-stream = "0.3"
bufsize = "1.0.5"
byteorder = "1.3"

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

@ -11,7 +11,7 @@ path = "src/bin/cli.rs"
[dependencies]
anyhow = "1.0.75"
async-compression = { version = "0.4.1", features = ["brotli", "bzip2", "deflate", "futures-io", "gzip", "tokio", "zlib", "zstd", "zstdmt"] }
async-compression = { version = "0.4.9", features = ["brotli", "bzip2", "deflate", "futures-io", "gzip", "tokio", "zlib", "zstd", "zstdmt"] }
async-runtime = { version = "0.1.0", path = "../async-runtime" }
auto_impl = "1.1.0"
clientinfo = { version = "0.1.0", path = "../clientinfo" }