Fixing a zombie, probably due to the new conflict algorithm

[?]
Nov 26, 2020, 5:49 PM
JMBGCWM5FYXPAMTU5R7UCMBIHJMUVCT44B6KGQ7P7XZRX662TC4QC

Dependencies

  • [2] H62VFFJE Cargo.nix, and solving conflicts
  • [3] 3WIQYEIS Fixing conflicts in Cargo.lock
  • [4] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
  • [5] OCBM7IFE New release: pijul-1.0.0-alpha.8

Change contents

  • resurrect zombie in "Cargo.lock" at line 2189
    [2.1375][3.1081620:1081685](),[3.1081620][3.1081620:1081685](),[3.1081620][3.1081620:1081685]()
    source = "registry+https://github.com/rust-lang/crates.io-index"
  • resurrect zombie in "Cargo.lock" at line 2191
    [2.1454][3.1081763:1081780](),[3.1081763][3.1081763:1081780](),[3.1081763][3.1081763:1081780]()
    dependencies = [
  • resurrect zombie in "Cargo.lock" at line 2193
    [2.1472][3.1081798:1081806](),[3.1081798][3.1081798:1081806](),[3.1081798][3.1081798:1081806]()
    "log",
  • resurrect zombie in "Cargo.lock" at line 2259
    [2.1519][3.1083468:1083533](),[3.1083468][3.1083468:1083533](),[3.1083468][3.1083468:1083533]()
    source = "registry+https://github.com/rust-lang/crates.io-index"
  • resurrect zombie in "Cargo.lock" at line 2261
    [2.1598][3.1083611:1087648](),[3.1083611][3.1083611:1087648](),[3.1083611][3.1083611:1087648]()
    [[package]]
    name = "unicode-width"
    version = "0.1.8"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
    [[package]]
    name = "unicode-xid"
    version = "0.2.1"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
    [[package]]
    name = "url"
    version = "2.2.0"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
    dependencies = [
    "form_urlencoded",
    "idna",
    "matches",
    "percent-encoding",
    ]
    [[package]]
    name = "uuid"
    version = "0.8.1"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
    dependencies = [
    "rand",
    ]
    [[package]]
    name = "vcpkg"
    version = "0.2.10"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
    [[package]]
    name = "vec_map"
    version = "0.8.2"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
    [[package]]
    name = "version_check"
    version = "0.9.2"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
    [[package]]
    name = "walkdir"
    version = "2.3.1"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
    dependencies = [
    "same-file",
    "winapi 0.3.9",
    "winapi-util",
    ]
    [[package]]
    name = "want"
    version = "0.3.0"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
    dependencies = [
    "log",
    "try-lock",
    ]
    [[package]]
    name = "wasi"
    version = "0.9.0+wasi-snapshot-preview1"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
    [[package]]
    name = "wasi"
    version = "0.10.0+wasi-snapshot-preview1"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
    [[package]]
    name = "wasm-bindgen"
    version = "0.2.68"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42"
    dependencies = [
    "cfg-if 0.1.10",
    "serde",
    "serde_json",
    "wasm-bindgen-macro",
    ]
    [[package]]
    name = "wasm-bindgen-backend"
    version = "0.2.68"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68"
    dependencies = [
    "bumpalo",
    "lazy_static",
    "log",
    "proc-macro2",
    "quote",
    "syn",
    "wasm-bindgen-shared",
    ]
    [[package]]
    name = "wasm-bindgen-futures"
    version = "0.4.18"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "b7866cab0aa01de1edf8b5d7936938a7e397ee50ce24119aef3e1eaa3b6171da"
    dependencies = [
    "cfg-if 0.1.10",
    "js-sys",
    "wasm-bindgen",
    "web-sys",
    ]
    [[package]]
    name = "wasm-bindgen-macro"
    version = "0.2.68"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038"
    dependencies = [
    "quote",
    "wasm-bindgen-macro-support",
    ]
    [[package]]
    name = "wasm-bindgen-macro-support"
    version = "0.2.68"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe"
    dependencies = [
    "proc-macro2",
    "quote",
    "syn",
    "wasm-bindgen-backend",
    "wasm-bindgen-shared",
    ]
    [[package]]
    name = "wasm-bindgen-shared"
    version = "0.2.68"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
    [[package]]