This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11938

rust: Upgrade to format-bytes 0.3
ClosedPublic

Authored by SimonSapin on Dec 17 2021, 5:47 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGd3ec82016104: rust: Upgrade to format-bytes 0.3
Summary

This removes use of the proc-macro-hack crate, which is possible now that
we don’t support Rust 1.41 to 1.44 anymore.

This in turn fixes spurious errors reported by rust-analyser:
https://github.com/rust-analyzer/rust-analyzer/issues/9606#issuecomment-919240134

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

SimonSapin created this revision.Dec 17 2021, 5:47 AM
SimonSapin edited the summary of this revision. (Show Details)Dec 17 2021, 5:55 AM
Alphare accepted this revision.Dec 17 2021, 6:05 AM
This revision is now accepted and ready to land.Dec 17 2021, 6:05 AM
SimonSapin added a commit: rHGd3ec82016104: rust: Upgrade to format-bytes 0.3.Dec 17 2021, 6:15 AM
Closed by commit rHGd3ec82016104: rust: Upgrade to format-bytes 0.3 (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/Cargo.lock (16 lines)
Mrust/hg-core/Cargo.toml (2 lines)
Mrust/rhg/Cargo.toml (2 lines)

Diff 31525

rust/Cargo.lock

"crc32fast", "crc32fast",
"libc", "libc",
"libz-sys", "libz-sys",
"miniz_oxide", "miniz_oxide",
] ]
[[package]] [[package]]
name = "format-bytes" name = "format-bytes"
version = "0.2.2" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c4e89040c7fd7b4e6ba2820ac705a45def8a0c098ec78d170ae88f1ef1d5762" checksum = "48942366ef93975da38e175ac9e10068c6fc08ca9e85930d4f098f4d5b14c2fd"
dependencies = [ dependencies = [
"format-bytes-macros", "format-bytes-macros",
"proc-macro-hack",
] ]
[[package]] [[package]]
name = "format-bytes-macros" name = "format-bytes-macros"
version = "0.3.0" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b05089e341a0460449e2210c3bf7b61597860b07f0deae58da38dbed0a4c6b6d" checksum = "203aadebefcc73d12038296c228eabf830f99cba991b0032adf20e9fa6ce7e4f"
dependencies = [ dependencies = [
"proc-macro-hack",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn",
] ]
[[package]] [[package]]
name = "generic-array" name = "generic-array"
version = "0.14.4" version = "0.14.4"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"ctor", "ctor",
"difference", "difference",
"output_vt100", "output_vt100",
] ]
[[package]] [[package]]
name = "proc-macro-hack"
version = "0.5.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
[[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.24" version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
dependencies = [ dependencies = [
"unicode-xid", "unicode-xid",
] ]

rust/hg-core/Cargo.toml

same-file = "1.0.6" same-file = "1.0.6"
stable_deref_trait = "1.2.0" stable_deref_trait = "1.2.0"
tempfile = "3.1.0" tempfile = "3.1.0"
crossbeam-channel = "0.4" crossbeam-channel = "0.4"
micro-timer = "0.3.0" micro-timer = "0.3.0"
log = "0.4.8" log = "0.4.8"
memmap2 = {version = "0.4", features = ["stable_deref_trait"]} memmap2 = {version = "0.4", features = ["stable_deref_trait"]}
zstd = "0.5.3" zstd = "0.5.3"
format-bytes = "0.2.2" format-bytes = "0.3.0"
# We don't use the `miniz-oxide` backend to not change rhg benchmarks and until # We don't use the `miniz-oxide` backend to not change rhg benchmarks and until
# we have a clearer view of which backend is the fastest. # we have a clearer view of which backend is the fastest.
[dependencies.flate2] [dependencies.flate2]
version = "1.0.16" version = "1.0.16"
features = ["zlib"] features = ["zlib"]
default-features = false default-features = false
[dev-dependencies] [dev-dependencies]
clap = "*" clap = "*"
pretty_assertions = "0.6.1" pretty_assertions = "0.6.1"

rust/rhg/Cargo.toml

clap = "2.33.1" clap = "2.33.1"
derive_more = "0.99" derive_more = "0.99"
home = "0.5.3" home = "0.5.3"
lazy_static = "1.4.0" lazy_static = "1.4.0"
log = "0.4.11" log = "0.4.11"
micro-timer = "0.3.1" micro-timer = "0.3.1"
regex = "1.3.9" regex = "1.3.9"
env_logger = "0.7.1" env_logger = "0.7.1"
format-bytes = "0.2.1" format-bytes = "0.3.0"
users = "0.11.0" users = "0.11.0"