rust/hg-core/Cargo.toml
author Mads Kiilerich <mads@kiilerich.com>
Mon, 11 Jul 2022 22:47:56 +0200
branchstable
changeset 49398 1bad05cfc818
parent 49287 127d33e63d1a
child 49524 eb02decdf0ab
permissions -rw-r--r--
rust: bump to memmap2 0.5.3, micro-timer 0.4.0, and crossbeam-channel 0.5.0 The merge in 12adf8c695ed had conflicts in rust/Cargo.lock and rust/hg-core/Cargo.toml . Let's ignore rust/Cargo.lock - it is regenerated. For rust/hg-core/Cargo.toml, stable had dd6b67d5c256 "rust: fix unsound `OwningDirstateMap`" which introduced ouroboros (and dropped stable_deref_trait). Default had ec8d9b5a5e7c "rust-hg-core: upgrade dependencies" which had a lot of churn bumping minimum versions - also patch versions. It is indeed a good idea to bump to *allow* use of latest package. That means that major versions should be bumped for packages after 1.0, and for packages below 1.0 minor versions should be bumped too. But it doesn't work to try enforce a policy of using latest patch by bumping versions at arbitrary times. For good or bad, the merge doesn't seem to have resolved the conflicts correctly, and many of the minor "upgrade dependencies" were lost again. Unfortunately, it also lost the bump of memmap2 to 0.5.3, which is needed for Fedora packaging where 0.4 isn't available. Same with micro-timer bump to 0.4 (which already is used in rhg). crossbeam-channel bump was also lost. This change fixes that regression by redoing these "important" lines of the merge "correctly". I propose this for stable, even though dependency changes on stable branches are annoying.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
40271
dbc28c91f7ff rust: pure Rust lazyancestors iterator
Georges Racinet <gracinet@anybox.fr>
parents:
diff changeset
     1
[package]
dbc28c91f7ff rust: pure Rust lazyancestors iterator
Georges Racinet <gracinet@anybox.fr>
parents:
diff changeset
     2
name = "hg-core"
dbc28c91f7ff rust: pure Rust lazyancestors iterator
Georges Racinet <gracinet@anybox.fr>
parents:
diff changeset
     3
version = "0.1.0"
dbc28c91f7ff rust: pure Rust lazyancestors iterator
Georges Racinet <gracinet@anybox.fr>
parents:
diff changeset
     4
authors = ["Georges Racinet <gracinet@anybox.fr>"]
dbc28c91f7ff rust: pure Rust lazyancestors iterator
Georges Racinet <gracinet@anybox.fr>
parents:
diff changeset
     5
description = "Mercurial pure Rust core library, with no assumption on Python bindings (FFI)"
42609
326fdce22fb2 rust: switch hg-core and hg-cpython to rust 2018 edition
Raphaël Gomès <rgomes@octobus.net>
parents: 42353
diff changeset
     6
edition = "2018"
40271
dbc28c91f7ff rust: pure Rust lazyancestors iterator
Georges Racinet <gracinet@anybox.fr>
parents:
diff changeset
     7
dbc28c91f7ff rust: pure Rust lazyancestors iterator
Georges Racinet <gracinet@anybox.fr>
parents:
diff changeset
     8
[lib]
dbc28c91f7ff rust: pure Rust lazyancestors iterator
Georges Racinet <gracinet@anybox.fr>
parents:
diff changeset
     9
name = "hg"
41703
ee7b7bd432a1 rust: translated random test of missingancestors
Georges Racinet <gracinet@anybox.fr>
parents: 40271
diff changeset
    10
42329
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate`
Raphaël Gomès <rgomes@octobus.net>
parents: 41703
diff changeset
    11
[dependencies]
49044
ec8d9b5a5e7c rust-hg-core: upgrade dependencies
Raphaël Gomès <rgomes@octobus.net>
parents: 49041
diff changeset
    12
bitflags = "1.3.2"
ec8d9b5a5e7c rust-hg-core: upgrade dependencies
Raphaël Gomès <rgomes@octobus.net>
parents: 49041
diff changeset
    13
bytes-cast = "0.2.0"
ec8d9b5a5e7c rust-hg-core: upgrade dependencies
Raphaël Gomès <rgomes@octobus.net>
parents: 49041
diff changeset
    14
byteorder = "1.4.3"
ec8d9b5a5e7c rust-hg-core: upgrade dependencies
Raphaël Gomès <rgomes@octobus.net>
parents: 49041
diff changeset
    15
derive_more = "0.99.17"
ec8d9b5a5e7c rust-hg-core: upgrade dependencies
Raphaël Gomès <rgomes@octobus.net>
parents: 49041
diff changeset
    16
hashbrown = { version = "0.9.1", features = ["rayon"] }
ec8d9b5a5e7c rust-hg-core: upgrade dependencies
Raphaël Gomès <rgomes@octobus.net>
parents: 49041
diff changeset
    17
home = "0.5.3"
48882
13c37f1c7c4b rust: relax im-rc dependency to allow minor updates
Mads Kiilerich <mads@kiilerich.com>
parents: 48825
diff changeset
    18
im-rc = "15.0"
49044
ec8d9b5a5e7c rust-hg-core: upgrade dependencies
Raphaël Gomès <rgomes@octobus.net>
parents: 49041
diff changeset
    19
itertools = "0.10.3"
44606
d31d1c0685be rust: update all dependencies
Raphaël Gomès <rgomes@octobus.net>
parents: 44605
diff changeset
    20
lazy_static = "1.4.0"
48207
4d5a13253d34 dirstate-v2: Replace the 32-bit `mode` field with two bits
Simon Sapin <simon.sapin@octobus.net>
parents: 48057
diff changeset
    21
libc = "0.2"
48825
dd6b67d5c256 rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents: 48582
diff changeset
    22
ouroboros = "0.15.0"
48582
0dc698c91ca0 rust: upgrade `rand*` crates
Martin von Zweigbergk <martinvonz@google.com>
parents: 48531
diff changeset
    23
rand = "0.8.4"
0dc698c91ca0 rust: upgrade `rand*` crates
Martin von Zweigbergk <martinvonz@google.com>
parents: 48531
diff changeset
    24
rand_pcg = "0.3.1"
49044
ec8d9b5a5e7c rust-hg-core: upgrade dependencies
Raphaël Gomès <rgomes@octobus.net>
parents: 49041
diff changeset
    25
rand_distr = "0.4.3"
ec8d9b5a5e7c rust-hg-core: upgrade dependencies
Raphaël Gomès <rgomes@octobus.net>
parents: 49041
diff changeset
    26
rayon = "1.5.1"
ec8d9b5a5e7c rust-hg-core: upgrade dependencies
Raphaël Gomès <rgomes@octobus.net>
parents: 49041
diff changeset
    27
regex = "1.5.5"
ec8d9b5a5e7c rust-hg-core: upgrade dependencies
Raphaël Gomès <rgomes@octobus.net>
parents: 49041
diff changeset
    28
sha-1 = "0.10.0"
ec8d9b5a5e7c rust-hg-core: upgrade dependencies
Raphaël Gomès <rgomes@octobus.net>
parents: 49041
diff changeset
    29
twox-hash = "1.6.2"
44345
4caac36c66bc rust-utils: add util for canonical path
Raphaël Gomès <rgomes@octobus.net>
parents: 44313
diff changeset
    30
same-file = "1.0.6"
47355
7138c863d0a1 dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents: 47127
diff changeset
    31
tempfile = "3.1.0"
49398
1bad05cfc818 rust: bump to memmap2 0.5.3, micro-timer 0.4.0, and crossbeam-channel 0.5.0
Mads Kiilerich <mads@kiilerich.com>
parents: 49287
diff changeset
    32
crossbeam-channel = "0.5.0"
1bad05cfc818 rust: bump to memmap2 0.5.3, micro-timer 0.4.0, and crossbeam-channel 0.5.0
Mads Kiilerich <mads@kiilerich.com>
parents: 49287
diff changeset
    33
micro-timer = "0.4.0"
44550
82f51ab7a2dd rust: add logging utils
Raphaël Gomès <rgomes@octobus.net>
parents: 44549
diff changeset
    34
log = "0.4.8"
49398
1bad05cfc818 rust: bump to memmap2 0.5.3, micro-timer 0.4.0, and crossbeam-channel 0.5.0
Mads Kiilerich <mads@kiilerich.com>
parents: 49287
diff changeset
    35
memmap2 = { version = "0.5.3", features = ["stable_deref_trait"] }
45532
26c53ee51c68 hg-core: Add a limited read only `revlog` implementation
Antoine Cezar <antoine.cezar@octobus.net>
parents: 44976
diff changeset
    36
zstd = "0.5.3"
48531
d3ec82016104 rust: Upgrade to format-bytes 0.3
Simon Sapin <simon.sapin@octobus.net>
parents: 48207
diff changeset
    37
format-bytes = "0.3.0"
45532
26c53ee51c68 hg-core: Add a limited read only `revlog` implementation
Antoine Cezar <antoine.cezar@octobus.net>
parents: 44976
diff changeset
    38
45617
7bd13bf99d1c rust: update minimum supported Rust compiler version
Raphaël Gomès <rgomes@octobus.net>
parents: 45612
diff changeset
    39
# We don't use the `miniz-oxide` backend to not change rhg benchmarks and until
7bd13bf99d1c rust: update minimum supported Rust compiler version
Raphaël Gomès <rgomes@octobus.net>
parents: 45612
diff changeset
    40
# we have a clearer view of which backend is the fastest.
45532
26c53ee51c68 hg-core: Add a limited read only `revlog` implementation
Antoine Cezar <antoine.cezar@octobus.net>
parents: 44976
diff changeset
    41
[dependencies.flate2]
49044
ec8d9b5a5e7c rust-hg-core: upgrade dependencies
Raphaël Gomès <rgomes@octobus.net>
parents: 49041
diff changeset
    42
version = "1.0.22"
45532
26c53ee51c68 hg-core: Add a limited read only `revlog` implementation
Antoine Cezar <antoine.cezar@octobus.net>
parents: 44976
diff changeset
    43
features = ["zlib"]
26c53ee51c68 hg-core: Add a limited read only `revlog` implementation
Antoine Cezar <antoine.cezar@octobus.net>
parents: 44976
diff changeset
    44
default-features = false
44312
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Raphaël Gomès <rgomes@octobus.net>
parents: 44238
diff changeset
    45
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor`
Raphaël Gomès <rgomes@octobus.net>
parents: 44238
diff changeset
    46
[dev-dependencies]
49044
ec8d9b5a5e7c rust-hg-core: upgrade dependencies
Raphaël Gomès <rgomes@octobus.net>
parents: 49041
diff changeset
    47
clap = "2.34.0"
ec8d9b5a5e7c rust-hg-core: upgrade dependencies
Raphaël Gomès <rgomes@octobus.net>
parents: 49041
diff changeset
    48
pretty_assertions = "1.1.0"