Fixing conflicts in Cargo.lock

[?]

Nov 23, 2020, 10:31 PM

3WIQYEISUMGOL5FY4LCWOJS55CTTQA7WMJZXAE3Q4GQUTBFLAE7QC

Dependencies

[2] PJ7T2VFL Do not hang on locked repositories
[3] 23LVKATN Use pager crate for log output
[4] Q7CAYX5N Fixing Windows compilation
[5] NX5I5H53 New published versions
[6] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
[7] XWETQ4DE Upgrading versions
[8] OUWD436A Version bump
[9] B5Z4IMEU Generating Cargo.nix for pijul 1.0.0-alpha.6

Change contents

replacement in Cargo.lock at line 72

[4.1032392]→[4.1032392:1032411](∅→∅)

version = "0.3.54"

[4.1032392]

[4.1032411]

version = "0.3.55"
replacement in Cargo.lock at line 74

[4.1032476]→[4.1032476:1032554](∅→∅)

checksum = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28"

[4.1032476]

[4.1032554]

checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598"
edit in Cargo.lock at line 89

[4.1032850]

[4.1032850]

[[package]]
name = "base64"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
replacement in Cargo.lock at line 197

[4.1035288]→[4.109:128](∅→∅)

version = "1.0.63"

[4.1035288]

[4.1035307]

version = "1.0.65"
replacement in Cargo.lock at line 199

[4.1035372]→[4.129:207](∅→∅)

checksum = "ad9c6140b5a2c7db40ea56eb1821245e5362b44385c05b76288b1a599934ac87"

[4.1035372]

[4.1035450]

checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15"
edit in Cargo.lock at line 313

[4.1038025]

[4.1038025]

]

[[package]]
name = "console_error_panic_hook"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
dependencies = [
"cfg-if 0.1.10",
"wasm-bindgen",
edit in Cargo.lock at line 326

[4.1038040]

[4.1038040]

name = "const_fn"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"

[[package]]
edit in Cargo.lock at line 370

[4.1039156]

[4.1039156]

"lazy_static",
]

[[package]]
name = "crossbeam-utils"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
dependencies = [
"autocfg",
"cfg-if 1.0.0",
"const_fn",
edit in Cargo.lock at line 481

[4.1041571]→[4.1041571:1041759](∅→∅)

[[package]]
name = "dtoa"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"
replacement in Cargo.lock at line 948

[4.1052260]→[4.1052260:1052279](∅→∅)

version = "0.4.16"

[4.1052260]

[4.1052279]

version = "0.4.17"
replacement in Cargo.lock at line 950

[4.1052344]→[4.1052344:1052422](∅→∅)

checksum = "22dcbf2a4a289528dbef21686354904e1c694ac642610a9bff9e7df730d9ec72"

[4.1052344]

[4.1052422]

checksum = "b287fb45c60bb826a0dc68ff08742b9d88a2fea13d6e0c286b3172065aaf878c"
replacement in Cargo.lock at line 952

[4.1052439]→[4.1052439:1052459](∅→∅)

"crossbeam-utils",

[4.1052439]

[4.1052459]

"crossbeam-utils 0.8.0",
edit in Cargo.lock at line 1087

[4.867]→[2.984:1005](∅→∅)

"env_logger 0.8.2",
replacement in Cargo.lock at line 1120

[4.1056162]→[4.1056162:1056181](∅→∅)

version = "0.2.19"

[4.1056162]

[4.1056181]

version = "0.2.20"
replacement in Cargo.lock at line 1122

[4.1056246]→[4.1056246:1056324](∅→∅)

checksum = "ca46220853ba1c512fc82826d0834d87b06bcd3c2a42241b7de72f3d2fe17056"

[4.1056246]

[4.1056324]

checksum = "df40b13fe7ea1be9b9dffa365a51273816c345fc1811478b57ed7d964fbfc4ce"
edit in Cargo.lock at line 1457

[4.1064071]→[3.1016:1042](∅→∅)

version = "1.0.0-alpha.4"
edit in Cargo.lock at line 1473

[4.1064329]→[3.1043:1056](∅→∅)

"libpijul",
edit in Cargo.lock at line 1549

[4.1065876]

[4.1065876]

name = "pin-project-lite"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"

[[package]]
replacement in Cargo.lock at line 1719

[4.1070218]→[4.1070218:1070237](∅→∅)

version = "0.10.8"

[4.1070218]

[4.1070237]

version = "0.10.9"
replacement in Cargo.lock at line 1721

[4.1070302]→[4.1070302:1070380](∅→∅)

checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e"

[4.1070302]

[4.1070380]

checksum = "fb15d6255c792356a0f578d8a645c677904dc02e862bebe2ecc18e0c01b9a0ce"
replacement in Cargo.lock at line 1723

[4.1070397]→[4.1070397:1070408](∅→∅)

"base64",

[4.1070397]

[4.1070408]

"base64 0.13.0",
replacement in Cargo.lock at line 1740

[4.1070620]→[4.1070620:1070641](∅→∅)

"pin-project-lite",

[4.1070620]

[4.1070641]

"pin-project-lite 0.2.0",
edit in Cargo.lock at line 1748

[4.1070746]

[4.1070746]

"wasm-bindgen-test",
replacement in Cargo.lock at line 1769

[4.1071221]→[4.1071221:1071232](∅→∅)

"base64",

[4.1071221]

[4.1071232]

"base64 0.12.3",
replacement in Cargo.lock at line 1772

[4.1071270]→[4.1071270:1071290](∅→∅)

"crossbeam-utils",

[4.1071270]

[4.1071290]

"crossbeam-utils 0.7.2",
edit in Cargo.lock at line 1825

[4.1072619]

[4.1072619]

[[package]]
name = "scoped-tls"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
replacement in Cargo.lock at line 1894

[4.1074143]→[4.1074143:1074161](∅→∅)

version = "0.6.1"

[4.1074143]

[4.1074161]

version = "0.7.0"
replacement in Cargo.lock at line 1896

[4.1074226]→[4.1074226:1074304](∅→∅)

checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"

[4.1074226]

[4.1074304]

checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
replacement in Cargo.lock at line 1898

[4.1074321]→[4.1074321:1074330](∅→∅)

"dtoa",

[4.1074321]

[4.1074330]

"form_urlencoded",
edit in Cargo.lock at line 1900

[4.1074339]

[4.1074339]

"ryu",
edit in Cargo.lock at line 1902

[4.1074349]→[4.1074349:1074357](∅→∅)

"url",
replacement in Cargo.lock at line 1924

[4.1074958]→[4.1074958:1074977](∅→∅)

version = "0.3.16"

[4.1074958]

[4.1074977]

version = "0.3.17"
replacement in Cargo.lock at line 1926

[4.1075042]→[4.1075042:1075120](∅→∅)

checksum = "7fd8b795c389288baa5f355489c65e71fd48a02104600d15c4cfbc561e9e429d"

[4.1075042]

[4.1075120]

checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902"
replacement in Cargo.lock at line 1928

[4.1075137]→[4.1075137:1075155](∅→∅)

"cfg-if 0.1.10",

[4.1075137]

[4.1075155]

"cfg-if 1.0.0",
replacement in Cargo.lock at line 1954

[4.1075798]→[4.1075798:1075817](∅→∅)

version = "1.0.48"

[4.1075798]

[4.1075817]

version = "1.0.50"
replacement in Cargo.lock at line 1956

[4.1075882]→[4.1075882:1075960](∅→∅)

checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"

[4.1075882]

[4.1075960]

checksum = "443b4178719c5a851e1bde36ce12da21d74a0e60b4d982ec3385a933c812f0f6"
replacement in Cargo.lock at line 2125

[4.1079608]→[4.1079608:1079626](∅→∅)

version = "1.0.1"

[4.1079608]

[4.1079626]

version = "1.1.0"
replacement in Cargo.lock at line 2127

[4.1079691]→[4.1079691:1079769](∅→∅)

checksum = "b78a366903f506d2ad52ca8dc552102ffdd3e937ba8a227f024dc1d1eae28575"

[4.1079691]

[4.1079769]

checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"
replacement in Cargo.lock at line 2154

[4.1080326]→[4.1080326:1080347](∅→∅)

"pin-project-lite",

[4.1080326]

[4.1080347]

"pin-project-lite 0.1.11",
replacement in Cargo.lock at line 2190

[4.1081124]→[4.1081124:1081145](∅→∅)

"pin-project-lite",

[4.1081124]

[4.1081145]

"pin-project-lite 0.1.11",
replacement in Cargo.lock at line 2217

[4.1081806]→[4.1081806:1081827](∅→∅)

"pin-project-lite",

[4.1081806]

[4.1081827]

"pin-project-lite 0.1.11",
edit in Cargo.lock at line 2438

[4.1087648]

[4.1087648]

name = "wasm-bindgen-test"
version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34d1cdc8b98a557f24733d50a1199c4b0635e465eecba9c45b214544da197f64"
dependencies = [
"console_error_panic_hook",
"js-sys",
"scoped-tls",
"wasm-bindgen",
"wasm-bindgen-futures",
"wasm-bindgen-test-macro",
]

[[package]]
name = "wasm-bindgen-test-macro"
version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8fb9c67be7439ee8ab1b7db502a49c05e51e2835b66796c705134d9b8e1a585"
dependencies = [
"proc-macro2",
"quote",
]

[[package]]
replacement in Cargo.lock at line 2575

[4.1090745]→[4.1090745:1090763](∅→∅)

version = "0.1.1"

[4.1090745]

[4.1090763]

version = "0.1.2"
replacement in Cargo.lock at line 2577

[4.1090828]→[4.1090828:1090906](∅→∅)

checksum = "6da0308f103ce1f046228c831786f60ebad8efff658d7e056fd94c761956ec2d"

[4.1090828]

[4.1090906]

checksum = "7dcfad2d277a31625c999d7d6915690aee7ea4042d77b5c44ac570a8e83fd5df"