pijul nest
guest › [sign in] [explore]

Solving conflicts in Cargo.lock

pmeunier
Dec 6, 2021, 12:32 PM
RRAB6UKLSNQXMAGX45TC4BIQSDXV46ZDPN2MFWPG7CUCVJLFBVJAC

Dependencies

  • [2] VKBJ6XB6 Formatting and version bump
  • [3] MUYNSHG2 update Nix build for Rust 2021 edition requirement
  • [4] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
  • [5] 3WIQYEIS Fixing conflicts in Cargo.lock
  • [6] WEHUTJUK Lockfile update
  • [7] T3S4P4ET Version updates
  • [8] QJXNUQFJ Solving conflicts
  • [9] FYUDBQ3C Formatting changes + version bump
  • [10] HKA66XOQ Updating Thrussh version for long or massive connections
  • [11] A3RM526Y Integrating identity malleability
  • [12] FSNBD6GK Debugging information and Cargo.lock updates (attempting to measure and solve #468)
  • [13] NWYJJHDF Version bump
  • [14] XF3FRWJ6 Version bump (including clap 3.0.0-beta.4)
  • [15] 6XDVUSBM Version bump
  • [16] C73F2EFD Version bump
  • [17] 5FI6SBEZ Re-implement change printing and parsing
  • [18] 6DOXSHWG Cleanup, and version bump
  • [19] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
  • [20] V4T4SC7O Testing binary diff
  • [21] H4IRHDJI Upgrading some deps
  • [22] FDPGJDXV Compiling Thrussh with feature OpenSSL by default

Change contents

  • replacement in Cargo.lock at line 50
    [4.1031374]→[2.789:808](∅→∅)
    version = "1.0.48"
    [4.1031374]
    [4.1031393]
    version = "1.0.51"
  • replacement in Cargo.lock at line 52
    [4.1031458]→[2.809:887](∅→∅)
    checksum = "62e1f47f7dc0422027a4e370dd4548d4d66b26782e513e98dca1e689e058a80e"
    [4.1031458]
    [4.1031536]
    checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"
  • replacement in Cargo.lock at line 106
    [4.8515]→[2.1085:1103](∅→∅)
    version = "1.2.0"
    [4.8515]
    [4.8533]
    version = "1.3.0"
  • replacement in Cargo.lock at line 108
    [4.8598]→[2.1104:1182](∅→∅)
    checksum = "392c772b012d685a640cdad68a5a21f4a45e696f85a2c2c907aab2fe49a91e19"
    [4.8598]
    [4.8676]
    checksum = "43a46022bae2c3bc5a17c2d45d59c1233ce0e2cca9ae9b92e92e9ce529874177"
  • replacement in Cargo.lock at line 335
    [4.4873]→[4.4873:4891](∅→∅)
    version = "1.2.1"
    [4.4873]
    [4.4891]
    version = "1.3.0"
  • replacement in Cargo.lock at line 337
    [4.4956]→[4.4956:5034](∅→∅)
    checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
    [4.4956]
    [4.5034]
    checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836"
  • replacement in Cargo.lock at line 775
    [4.16490]→[2.3655:3675](∅→∅)
    version = "0.13.24"
    [4.16490]
    [4.16510]
    version = "0.13.25"
  • replacement in Cargo.lock at line 777
    [4.16575]→[2.3676:3754](∅→∅)
    checksum = "845e007a28f1fcac035715988a234e8ec5458fd825b20a20c7dec74237ef341f"
    [4.16575]
    [4.16653]
    checksum = "f29229cc1b24c0e6062f6e742aa3e256492a5323365e5ed3413599f8a5eff7d6"
  • replacement in Cargo.lock at line 1032
    [4.22439]→[2.4641:4661](∅→∅)
    version = "0.2.108"
    [4.22439]
    [4.22458]
    version = "0.2.109"
  • replacement in Cargo.lock at line 1034
    [4.22523]→[2.4662:4740](∅→∅)
    checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119"
    [4.22523]
    [4.22601]
    checksum = "f98a04dce437184842841303488f70d0188c5f51437d2a834dc097eafa909a01"
  • replacement in Cargo.lock at line 1038
    [4.22635]→[2.4741:4767](∅→∅)
    version = "0.12.25+1.3.0"
    [4.22635]
    [4.22661]
    version = "0.12.26+1.3.0"
  • replacement in Cargo.lock at line 1040
    [4.22726]→[2.4768:4846](∅→∅)
    checksum = "8f68169ef08d6519b2fe133ecc637408d933c0174b23b80bb2f79828966fbaab"
    [4.22726]
    [4.22804]
    checksum = "19e1c899248e606fbfe68dcb31d8b0176ebab833b103824af31bddf4b7457494"
  • replacement in Cargo.lock at line 1208
    [4.26340]→[4.26340:26358](∅→∅)
    version = "0.6.4"
    [4.26340]
    [4.26358]
    version = "0.6.5"
  • replacement in Cargo.lock at line 1210
    [4.26423]→[4.26423:26501](∅→∅)
    checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
    [4.26423]
    [4.26501]
    checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
  • edit in Cargo.lock at line 1505
    [4.33516]→[3.23219:23246](∅→∅)
    version = "1.0.0-alpha.56"