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 c5d4950 commit 712c290
Show file tree
Hide file tree
Showing 36 changed files with 113 additions and 81 deletions.
100 changes: 66 additions & 34 deletions hphp/hack/src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ hash = { version = "0.0.0", path = "../../../utils/hash" }
typing_deps_hash = { version = "0.0.0", path = "../../../deps/cargo/typing_deps_hash" }

[dev-dependencies]
tempfile = "3.8"
tempfile = "3.15"
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ hash = { version = "0.0.0", path = "../../../../utils/hash" }
log = { version = "0.4.22", features = ["kv_unstable"] }
newtype = { version = "0.0.0", path = "../../../../utils/newtype" }
rayon = "1.9.0"
smallvec = { version = "1.6.1", features = ["serde", "specialization", "union"] }
smallvec = { version = "1.13.2", features = ["serde", "specialization", "union"] }
vint64 = "1.0.1"
zstd = { version = "0.13", features = ["experimental", "zstdmt"] }
4 changes: 2 additions & 2 deletions hphp/hack/src/hackc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ positioned_full_trivia_parser = { version = "0.0.0", path = "../parser/api/cargo
positioned_parser = { version = "0.0.0", path = "../parser/api/cargo/positioned_parser" }
profile_rust = { version = "0.0.0", path = "../utils/perf/cargo/profile" }
rayon = "1.9.0"
regex = "1.9.2"
regex = "1.11.1"
relative_path = { version = "0.0.0", path = "../utils/rust/relative_path" }
sem_diff = { version = "0.0.0", path = "sem_diff" }
serde_json = { version = "1.0.132", features = ["float_roundtrip", "unbounded_depth"] }
shallow_decl_provider = { version = "0.0.0", path = "../hackrs/shallow_decl_provider/cargo/shallow_decl_provider" }
strum = { version = "0.26.2", features = ["derive"] }
tempfile = "3.8"
tempfile = "3.15"
textual = { version = "0.0.0", path = "ir/conversions/textual/cargo/textual" }
thiserror = "2"
ty = { version = "0.0.0", path = "../hackrs/ty/cargo/ty" }
6 changes: 3 additions & 3 deletions hphp/hack/src/hackc/emitter/cargo/emit_unit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ indexmap = { version = "2.2.6", features = ["arbitrary", "rayon", "serde"] }
instruction_sequence = { version = "0.0.0", path = "../instruction_sequence" }
itertools = "0.14.0"
label_rewriter = { version = "0.0.0", path = "../label_rewriter" }
lazy_static = "1.4"
lazy_static = "1.5"
naming_special_names_rust = { version = "0.0.0", path = "../../../../naming" }
options = { version = "0.0.0", path = "../../../compile/cargo/options" }
oxidized = { version = "0.0.0", path = "../../../../oxidized" }
oxidized_by_ref = { version = "0.0.0", path = "../../../../oxidized_by_ref" }
print_expr = { version = "0.0.0", path = "../../../print_expr" }
priority-queue = "1.2.2"
regex = "1.9.2"
regex = "1.11.1"
scope = { version = "0.0.0", path = "../scope" }
serde_json = { version = "1.0.132", features = ["float_roundtrip", "unbounded_depth"] }
smallvec = { version = "1.6.1", features = ["serde", "specialization", "union"] }
smallvec = { version = "1.13.2", features = ["serde", "specialization", "union"] }
stack_depth = { version = "0.0.0", path = "../../../utils/cargo/stack_depth" }
stack_limit = { version = "0.0.0", path = "../../../../utils/stack_limit" }
statement_state = { version = "0.0.0", path = "../statement_state" }
2 changes: 1 addition & 1 deletion hphp/hack/src/hackc/ir/conversions/ir_to_bc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ instruction_sequence = { version = "0.0.0", path = "../../../emitter/cargo/instr
ir = { version = "0.0.0", path = "../.." }
itertools = "0.14.0"
log = { version = "0.4.22", features = ["kv_unstable"] }
smallvec = { version = "1.6.1", features = ["serde", "specialization", "union"] }
smallvec = { version = "1.13.2", features = ["serde", "specialization", "union"] }
stack_depth = { version = "0.0.0", path = "../../../utils/cargo/stack_depth" }
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ itertools = "0.14.0"
log = { version = "0.4.22", features = ["kv_unstable"] }
naming_special_names_rust = { version = "0.0.0", path = "../../../../../../naming" }
newtype = { version = "0.0.0", path = "../../../../../../utils/newtype" }
regex = "1.9.2"
regex = "1.11.1"
strum = { version = "0.26.2", features = ["derive"] }
textual_macros = { version = "0.0.0", path = "../macros" }
4 changes: 2 additions & 2 deletions hphp/hack/src/hackc/print_expr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ error = { version = "0.0.0", path = "../error/cargo/error" }
escaper = { version = "0.0.0", path = "../../utils/escaper" }
hhbc = { version = "0.0.0", path = "../hhbc/cargo/hhbc" }
hhbc_string_utils = { version = "0.0.0", path = "../utils/cargo/hhbc_string_utils" }
lazy_static = "1.4"
lazy_static = "1.5"
naming_special_names_rust = { version = "0.0.0", path = "../../naming" }
oxidized = { version = "0.0.0", path = "../../oxidized" }
regex = "1.9.2"
regex = "1.11.1"
thiserror = "2"
write_bytes = { version = "0.0.0", path = "../../utils/write_bytes/write_bytes" }
4 changes: 2 additions & 2 deletions hphp/hack/src/hackc/utils/cargo/hhbc_string_utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ path = "../../string_utils.rs"
[dependencies]
bstr = { version = "1.10.0", features = ["serde", "std", "unicode"] }
escaper = { version = "0.0.0", path = "../../../../utils/escaper" }
lazy_static = "1.4"
lazy_static = "1.5"
libc = "0.2.139"
naming_special_names_rust = { version = "0.0.0", path = "../../../../naming" }
ocaml_helper = { version = "0.0.0", path = "../../../../utils/ocaml_helper" }
regex = "1.9.2"
regex = "1.11.1"

[dev-dependencies]
pretty_assertions = { version = "1.2", features = ["alloc"], default-features = false }
2 changes: 1 addition & 1 deletion hphp/hack/src/hackrs/cargo/decl_file_rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ hhi = { version = "0.0.0", path = "../../../hhi/rust" }
jwalk = "0.6"
oxidized = { version = "0.0.0", path = "../../../oxidized" }
pos = { version = "0.0.0", path = "../../pos/cargo/pos" }
tempfile = "3.8"
tempfile = "3.15"
ty = { version = "0.0.0", path = "../../ty/cargo/ty" }
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ oxidized_by_ref = { version = "0.0.0", path = "../../../oxidized_by_ref" }
pos = { version = "0.0.0", path = "../../pos/cargo/pos" }
rayon = "1.9.0"
relative_path = { version = "0.0.0", path = "../../../utils/rust/relative_path" }
tempfile = "3.8"
tempfile = "3.15"
ty = { version = "0.0.0", path = "../../ty/cargo/ty" }
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ path = "../../file_provider.rs"
anyhow = "1.0.95"
bstr = { version = "1.10.0", features = ["serde", "std", "unicode"] }
pos = { version = "0.0.0", path = "../../../pos/cargo/pos" }
tempfile = "3.8"
tempfile = "3.15"
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ oxidized = { version = "0.0.0", path = "../../../../oxidized" }
pos = { version = "0.0.0", path = "../../../pos/cargo/pos" }
relative_path = { version = "0.0.0", path = "../../../../utils/rust/relative_path" }
shallow_decl_provider = { version = "0.0.0", path = "../../../shallow_decl_provider/cargo/shallow_decl_provider" }
tempfile = "3.8"
tempfile = "3.15"
ty = { version = "0.0.0", path = "../../../ty/cargo/ty" }
2 changes: 1 addition & 1 deletion hphp/hack/src/hh_fanout/cargo/hh_fanout_build/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ memmap2 = "0.5.10"
newtype = { version = "0.0.0", path = "../../../utils/newtype" }
parking_lot = { version = "0.12.1", features = ["send_guard"] }
rayon = "1.9.0"
smallvec = { version = "1.6.1", features = ["serde", "specialization", "union"] }
smallvec = { version = "1.13.2", features = ["serde", "specialization", "union"] }
2 changes: 1 addition & 1 deletion hphp/hack/src/hh_naming_table_builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ rayon = "1.9.0"
relative_path = { version = "0.0.0", path = "../utils/rust/relative_path" }
si_addendum = { version = "0.0.0", path = "../utils/cargo/si_addendum" }
slog = { version = "2.7", features = ["max_level_trace", "nested-values"] }
tempfile = "3.8"
tempfile = "3.15"
2 changes: 1 addition & 1 deletion hphp/hack/src/naming/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ path = "naming_special_names.rs"

[dependencies]
hash = { version = "0.0.0", path = "../utils/hash" }
lazy_static = "1.4"
lazy_static = "1.5"
serde = { version = "1.0.185", features = ["derive", "rc"] }
write_bytes = { version = "0.0.0", path = "../utils/write_bytes/write_bytes" }
Loading

0 comments on commit 712c290

Please sign in to comment.