Skip to content

Commit

Permalink
Upgrade dependencies used by streampager
Browse files Browse the repository at this point in the history
Summary:
Upgrade dependencies requested by facebook/sapling#1008, with the exceptions:

- No change to `lru` and `indexmap`, because they want `hashbrown 0.15.2`,
  which fails to compile until Rust [1.84](rust-lang/rust@56ee492).

```
  error[E0635]: unknown feature `strict_provenance_lints`
    --> third-party/rust/vendor/hashbrown-0.15.2/src/lib.rs:24:9
     |
  24 |         strict_provenance_lints
     |         ^^^^^^^^^^^^^^^^^^^^^^^
```

- No change to `notify`. It specifies `fsevents-sys = "4.0.0"` and fails to compile:

```
  error[E0425]: cannot find function, tuple struct or tuple variant `FSEventsGetCurrentEventId` in crate `fs`
     --> third-party/rust/vendor/notify-8.0.0/src/fsevent.rs:462:40
      |
  462 |                     let event_id = fs::FSEventsGetCurrentEventId();
      |                                        ^^^^^^^^^^^^^^^^^^^^^^^^^ not found in `fs`

  (`FSEventsGetCurrentEventId` was introduced in `fsevents-sys 4.1.0`)
```

- No change to `unicode-width` because
  phsym/prettytable-rs#165 (`prettytable-rs` does not
  pin the "good" version of `unicode-width` so `unicode-width` has to be
  globally pinned)

- No change to `bit-set` to avoid incompatible types:

```
error[E0308]: mismatched types
   --> fbcode/hphp/hack/src/hackc/emitter/opt_body.rs:287:49
    |
287 |         avl_in.union_with(&BitSet::from_bit_vec(BitVec::from_elem(nparams, true)));
    |                            -------------------- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bit_vec::BitVec`, found `BitVec`
    |                            |
    |                            arguments to this function are incorrect
    |
    = note: `BitVec` and `bit_vec::BitVec` have similar names, but are actually distinct types
note: `BitVec` is defined in crate `bit_vec`
   --> third-party/rust/vendor/bit-vec-0.6.2/src/lib.rs:210:1
note: `bit_vec::BitVec` is defined in crate `bit_vec`
   --> third-party/rust/vendor/bit-vec-0.8.0/src/lib.rs:249:1
    = note: perhaps two different versions of crate `bit_vec` are being used?
note: associated function defined here
   --> third-party/rust/vendor/bit-set-0.8.0/src/lib.rs:240:12
```

- No change to `memmap2` since it seems to cause hack-www-test breakage.

Reviewed By: zzl0

Differential Revision: D69427081

fbshipit-source-id: f520721fd4b828ae46c6b2d7875fa68eaafe603e
  • Loading branch information
quark-zju authored and facebook-github-bot committed Feb 13, 2025
1 parent 6ff5b90 commit e3a17e3
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions detcore/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ clap = { version = "3.2.25", features = ["derive", "env", "regex", "unicode", "w
detcore-model = { version = "0.0.0", path = "../detcore-model" }
digest = { version = "0.0.0", path = "../common/digest" }
futures = { version = "0.3.30", features = ["async-await", "compat"] }
lazy_static = "1.4"
lazy_static = "1.5"
libc = "0.2.139"
nix = { version = "0.29.0", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "signal", "term", "time", "user", "zerocopy"] }
pretty = "0.12.1"
Expand All @@ -42,11 +42,11 @@ rand = { version = "0.8", features = ["small_rng"] }
rand_distr = "0.4"
rand_pcg = { version = "0.3", features = ["serde1"] }
raw-cpuid = "10.6.0"
regex = "1.9.2"
regex = "1.11.1"
reverie = { version = "0.1.0", git = "https://github.com/facebookexperimental/reverie.git", branch = "main" }
serde = { version = "1.0.185", features = ["derive", "rc"] }
serde_json = { version = "1.0.132", features = ["float_roundtrip", "unbounded_depth"] }
tempfile = "3.8"
tempfile = "3.15"
tokio = { version = "1.41.0", features = ["full", "test-util", "tracing"] }
tracing = { version = "0.1.41", features = ["attributes", "valuable"] }

Expand Down
2 changes: 1 addition & 1 deletion detcore/tests/testutils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license = "BSD-3-Clause"

[dependencies]
detcore = { version = "0.0.0", path = "../.." }
lazy_static = "1.4"
lazy_static = "1.5"
pretty_assertions = { version = "1.2", features = ["alloc"], default-features = false }
reverie = { version = "0.1.0", git = "https://github.com/facebookexperimental/reverie.git", branch = "main" }
reverie-ptrace = { version = "0.1.0", git = "https://github.com/facebookexperimental/reverie.git", branch = "main" }
Expand Down
8 changes: 4 additions & 4 deletions hermit-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@ clap = { version = "3.2.25", features = ["derive", "env", "regex", "unicode", "w
colored = "2.1.0"
detcore = { version = "0.0.0", path = "../detcore" }
diff = "0.1"
dirs = "2.0"
dirs = "6.0"
edit-distance = { version = "0.0.0", path = "../common/edit-distance" }
fbinit = { version = "0.2.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
goblin = "0.5.2"
lazy_static = "1.4"
lazy_static = "1.5"
libc = "0.2.139"
nix = { version = "0.29.0", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "signal", "term", "time", "user", "zerocopy"] }
num_cpus = "1.16"
once_cell = "1.12"
pretty_assertions = { version = "1.2", features = ["alloc"], default-features = false }
rand = { version = "0.8", features = ["small_rng"] }
rand_pcg = { version = "0.3", features = ["serde1"] }
regex = "1.9.2"
regex = "1.11.1"
reverie = { version = "0.1.0", git = "https://github.com/facebookexperimental/reverie.git", branch = "main" }
reverie-ptrace = { version = "0.1.0", git = "https://github.com/facebookexperimental/reverie.git", branch = "main" }
serde = { version = "1.0.185", features = ["derive", "rc"] }
serde_json = { version = "1.0.132", features = ["float_roundtrip", "unbounded_depth"] }
shell-words = "1.1.0"
tempfile = "3.8"
tempfile = "3.15"
tokio = { version = "1.41.0", features = ["full", "test-util", "tracing"] }
tracing = { version = "0.1.41", features = ["attributes", "valuable"] }
tracing-appender = "0.2.3"
Expand Down
2 changes: 1 addition & 1 deletion hermit-verify/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fbinit = { version = "0.2.0", git = "https://github.com/facebookexperimental/rus
rand = { version = "0.8", features = ["small_rng"] }
serde_json = { version = "1.0.132", features = ["float_roundtrip", "unbounded_depth"] }
similar = { version = "2.2.0", features = ["inline"] }
tempfile = "3.8"
tempfile = "3.15"
tracing = { version = "0.1.41", features = ["attributes", "valuable"] }

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -165,5 +165,5 @@ close-err = "1.0.2"
detcore = { version = "0.0.0", path = "../detcore" }
libc = "0.2.139"
nix = { version = "0.29.0", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "signal", "term", "time", "user", "zerocopy"] }
regex = "1.9.2"
tempfile = "3.8"
regex = "1.11.1"
tempfile = "3.15"

0 comments on commit e3a17e3

Please sign in to comment.