Skip to content

Commit

Permalink
Partially sync Cargo.toml with shim/third-party/rust/Cargo.toml
Browse files Browse the repository at this point in the history
Summary:
Use the same version of libraries where it is clear they should be the same.

Perhaps we should set up CI to verify they are in sync.

Differential Revision: D44816263

fbshipit-source-id: 3a1b22db599f5a7d7893561eb0c3ff48dcbaeba6
  • Loading branch information
stepancheg authored and facebook-github-bot committed Apr 10, 2023
1 parent 1999838 commit 49b8b1b
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 11 deletions.
25 changes: 19 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ members = [

[workspace.dependencies]
anyhow = "1.0.65"
anymap = "0.12.1"
arc-swap = "1.6.0"
argfile = "0.1.0"
assert_matches = "1.5"
async-compression = { version = "0.3.8", features = ["tokio", "gzip", "zstd"] }
async-condvar-fair = { version = "0.2.2", features = ["parking_lot_0_11"] }
Expand Down Expand Up @@ -121,6 +123,7 @@ either = "1.8"
enum-iterator = "0.5.0"
enum-map = "0.6.3"
env_logger = "0.9.0"
erased-serde = "0.3.20"
faccess = "0.2.3"
fancy-regex = "0.10.0"
flate2 = "1.0.22"
Expand All @@ -132,7 +135,7 @@ glob = "0.3.0"
globset = "0.4.10"
hashbrown = { version = "0.12.3", features = ["raw"] }
hex = "0.4.3"
hostname = "^0.3"
hostname = "0.3.1"
http = "0.2"
httparse = "1.7.1"
humantime = "2.0.1"
Expand All @@ -146,25 +149,31 @@ inventory = "0.1.9"
is_proc_translated = "0.1.1"
itertools = "0.10.3"
jemallocator = { version = "0.5.0", features = ["profiling"] }
lalrpop = { version = "0.19.7", artifact = "bin" }
lalrpop-util = "0.19.7"
libc = "0.2.132"
linked-hash-map = { version = "0.5", features = ["serde_impl"] }
log = "0.4"
logos = "0.12"
lsp-server = "0.5"
lsp-types = "0.93.0"
maplit = "1.0.2"
memchr = "2.4.1"
memmap2 = "0.5"
memmap2 = "0.5.0"
memoffset = "0.6.4"
multimap = "0.8.2"
nix = "0.22"
nom = "6.1.2"
notify = "5.0.0"
num-bigint = "0.4.3"
num-traits = "0.2"
num_cpus = "1.11"
num_enum = "0.5"
object = "0.29.0"
once_cell = "1.3"
once_cell = "1.8"
os_str_bytes = "6.0"
parking_lot = { version = "0.11.2", features = ["send_guard"] }
paste = "1.0"
perf-event = "0.4"
perf-event-open-sys = "4.0"
pin-project = "0.4.29"
Expand All @@ -182,23 +191,25 @@ rand = { version = "0.8.4", features = ["small_rng"] }
rand_chacha = "0.3"
rand_distr = "0.4"
ref-cast = "1.0.0"
regex = "1.3.4"
regex = "1.5.4"
relative-path = { version = "1.7.0", features = ["serde"] }
reqwest = { version = "0.11.4", features = ["stream", "rustls-tls", "rustls-tls-webpki-roots"], default-features = false }
rusqlite = { version = "0.28.0", features = ["bundled"] }
rustyline = "9.1"
sequence_trie = "0.3.6"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.48"
sha1 = "0.10"
sha2 = "0.10"
shlex = "1.0"
siphasher = "0.3.3"
slab = "0.4.7"
slog = "2.7.0"
smallvec = { version = "1.10", features = ["const_generics", "const_new", "serde", "specialization", "union", "write"] }
static_assertions = "1.1.0"
strsim = "0.10.0"
structopt = "0.3.0"
syn = { version = "2", features = ["extra-traits", "full"] }
structopt = "0.3.23"
syn = { version = "2", features = ["extra-traits", "full", "visit"] }
sync_wrapper = "0.1.0"
sys-info = "0.9.1"
sysinfo = "0.26.8"
Expand Down Expand Up @@ -226,8 +237,10 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
triomphe = "0.1.8"
trybuild = "1.0.56"
twox-hash = "1.6.1"
unicode-segmentation = "1.7"
uuid = { version = "1.2", features = ["v4"] }
walkdir = "2.3.2"
which = "4.3.0"
winapi = { version = "0.3", features = ["everything"] }
xattr = "0.2.2"
zip = "0.5"
Expand Down
12 changes: 7 additions & 5 deletions shim/third-party/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ assert_matches = "1.5"
async-compression = { version = "0.3.8", features = ["tokio", "gzip", "zstd"] }
async-condvar-fair = { version = "0.2.2", features = ["parking_lot_0_11"] }
async-recursion = "1.0"
async-stream = "0.3.2"
async-trait = "0.1.24"
backtrace = "0.3.51"
base64 = "0.13.0"
Expand All @@ -48,7 +47,7 @@ chrono = "=0.4.19" # Avoid a dependency iana-time-zone, which requires a fixup
clap = { package = "clap", version = "4.0.7", features = ["derive", "env"] }
clap-3 = { package = "clap", version = "3.1.18", features = ["derive", "env"] }
common-path = "1.0.0"
compact_str = "0.6"
compact_str = "0.6.1"
constant_time_eq = "0.2.4"
convert_case = "0.4.0"
criterion = { version = "0.3.1", features = [] }
Expand Down Expand Up @@ -78,7 +77,7 @@ fs2 = "0.4.3"
futures = { version = "0.3.24", features = ["async-await", "compat"] }
futures-intrusive = "0.4"
glob = "0.3.0"
globset = "0.4.7"
globset = "0.4.10"
hashbrown = { version = "0.12.3", features = ["raw"] }
hex = "0.4.3"
hostname = "0.3.1"
Expand All @@ -89,12 +88,12 @@ indent_write = "2.2.0"
indenter = "0.3.3"
indexmap = { version = "1.9.1", features = ["serde-1"] }
indoc = "1.0.3"
inferno = "0.11.11"
inferno = { version = "0.11.11", default-features = false }
internment = { version = "0.7", features = ["arc"] }
inventory = "0.1.9"
is_proc_translated = "0.1.1"
itertools = "0.10.3"
jemallocator = { version = "0.3.2", features = ["profiling"] }
jemallocator = { version = "0.5.0", features = ["profiling"] }
lalrpop = { version = "0.19.7", artifact = "bin" }
lalrpop-util = "0.19.7"
libc = "0.2.132"
Expand All @@ -120,6 +119,8 @@ once_cell = "1.8"
os_str_bytes = "6.0"
parking_lot = { version = "0.11.2", features = ["send_guard"] }
paste = "1.0"
perf-event = "0.4"
perf-event-open-sys = "4.0"
pin-project = "0.4.29"
plist = "0.5"
pretty_assertions = "1.2.1"
Expand All @@ -128,6 +129,7 @@ prost = "0.11.6"
prost-build = "0.11.6"
prost-derive = "0.11.6"
prost-types = "0.11.6"
protoc-bin-vendored = "3.0.0"
psutil = "3.2"
quote = "1.0.3"
rand = { version = "0.8.4", features = ["small_rng"] }
Expand Down

0 comments on commit 49b8b1b

Please sign in to comment.