From 0b86c8992fc74e1be69896a187506e1098c9d0fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Dec 2022 12:03:52 +0000 Subject: [PATCH] Bump prettydiff from 0.3.1 to 0.6.2 Bumps [prettydiff](https://github.com/romankoblov/prettydiff) from 0.3.1 to 0.6.2. - [Release notes](https://github.com/romankoblov/prettydiff/releases) - [Commits](https://github.com/romankoblov/prettydiff/commits) --- updated-dependencies: - dependency-name: prettydiff dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 340 +++++++++++++++------ language/move-prover/test-utils/Cargo.toml | 2 +- 2 files changed, 244 insertions(+), 98 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9363eb707d3c..31ca4f0a6ad4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -123,15 +123,18 @@ dependencies = [ [[package]] name = "ansi_term" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ + "winapi 0.3.9", +] [[package]] name = "ansi_term" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ "winapi 0.3.9", ] @@ -202,7 +205,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.17", "libc", "winapi 0.3.9", ] @@ -271,7 +274,7 @@ dependencies = [ "serde", "serde_json", "storage-interface", - "structopt 0.3.21", + "structopt", "tokio", "tokio-util", "toml", @@ -734,7 +737,7 @@ dependencies = [ "rust_decimal", "rustyline", "serde", - "structopt 0.3.21", + "structopt", "tokio", "transaction-builder", "walkdir", @@ -801,7 +804,7 @@ dependencies = [ "serde_json", "serde_yaml", "state-synchronizer", - "structopt 0.3.21", + "structopt", "termion", "tokio", "toml", @@ -882,7 +885,7 @@ dependencies = [ "libra-canonical-serialization", "move-ir-types", "serde_json", - "structopt 0.3.21", + "structopt", "vm", ] @@ -1236,7 +1239,7 @@ version = "0.1.0" dependencies = [ "diem-workspace-hack", "regex", - "structopt 0.3.21", + "structopt", "termcolor", "walkdir", ] @@ -1256,7 +1259,7 @@ dependencies = [ "executor", "libra-canonical-serialization", "storage-interface", - "structopt 0.3.21", + "structopt", ] [[package]] @@ -1417,7 +1420,7 @@ dependencies = [ "serde-generate", "serde-reflection", "serde_yaml", - "structopt 0.3.21", + "structopt", "tempfile", ] @@ -1433,7 +1436,7 @@ dependencies = [ "hex", "libra-canonical-serialization", "reqwest", - "structopt 0.3.21", + "structopt", "tokio", ] @@ -1457,7 +1460,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "structopt 0.3.21", + "structopt", "tempfile", "tokio", "transaction-builder-generated", @@ -1513,7 +1516,7 @@ dependencies = [ "state-synchronizer", "stats_alloc", "storage-interface", - "structopt 0.3.21", + "structopt", "ureq", "vm", ] @@ -1543,7 +1546,7 @@ dependencies = [ "rand 0.7.3", "serde", "storage-interface", - "structopt 0.3.21", + "structopt", "thiserror", "toml", "transaction-builder", @@ -1760,7 +1763,7 @@ dependencies = [ "libra-canonical-serialization", "serde", "serde_yaml", - "structopt 0.3.21", + "structopt", "thiserror", "toml", "transaction-builder", @@ -1906,7 +1909,7 @@ dependencies = [ "storage-client", "storage-interface", "storage-service", - "structopt 0.3.21", + "structopt", "subscription-service", "tokio", ] @@ -1932,7 +1935,7 @@ dependencies = [ "libra-canonical-serialization", "serde", "serde_json", - "structopt 0.3.21", + "structopt", "thiserror", "toml", "transaction-builder", @@ -2068,7 +2071,7 @@ dependencies = [ "diem-workspace-hack", "diemdb", "storage-interface", - "structopt 0.3.21", + "structopt", "tempfile", "transaction-builder", ] @@ -2087,7 +2090,7 @@ dependencies = [ "diem-types", "diem-workspace-hack", "reqwest", - "structopt 0.3.21", + "structopt", "thiserror", ] @@ -2113,7 +2116,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "structopt 0.3.21", + "structopt", "tokio", ] @@ -2138,7 +2141,7 @@ dependencies = [ "move-vm-types", "resource-viewer", "stdlib", - "structopt 0.3.21", + "structopt", "vm", "vm-genesis", ] @@ -2286,7 +2289,7 @@ dependencies = [ "serde", "serde_json", "stdlib", - "structopt 0.3.21", + "structopt", "tempfile", ] @@ -2335,7 +2338,7 @@ dependencies = [ "serde", "serde_json", "storage-interface", - "structopt 0.3.21", + "structopt", ] [[package]] @@ -2371,17 +2374,6 @@ dependencies = [ "generic-array 0.14.4", ] -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - [[package]] name = "dirs" version = "2.0.2" @@ -2401,6 +2393,16 @@ dependencies = [ "dirs-sys", ] +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if 1.0.0", + "dirs-sys-next", +] + [[package]] name = "dirs-sys" version = "0.3.5" @@ -2408,7 +2410,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" dependencies = [ "libc", - "redox_users", + "redox_users 0.3.5", + "winapi 0.3.9", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users 0.4.3", "winapi 0.3.9", ] @@ -2425,7 +2438,7 @@ dependencies = [ "move-core-types", "move-coverage", "move-ir-types", - "structopt 0.3.21", + "structopt", "vm", ] @@ -2509,9 +2522,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "encode_unicode" -version = "0.3.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" @@ -2587,6 +2600,27 @@ dependencies = [ "test-utils", ] +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "execution-correctness" version = "0.1.0" @@ -2676,7 +2710,7 @@ dependencies = [ "storage-client", "storage-interface", "storage-service", - "structopt 0.3.21", + "structopt", "transaction-builder", ] @@ -2991,7 +3025,7 @@ dependencies = [ "serde", "serde-reflection", "serde_yaml", - "structopt 0.3.21", + "structopt", ] [[package]] @@ -3033,7 +3067,7 @@ dependencies = [ "diem-workspace-hack", "libra-canonical-serialization", "resource-viewer", - "structopt 0.3.21", + "structopt", "vm", "vm-genesis", ] @@ -3250,6 +3284,15 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + [[package]] name = "hex" version = "0.4.2" @@ -3465,6 +3508,16 @@ dependencies = [ "vm", ] +[[package]] +name = "io-lifetimes" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +dependencies = [ + "libc", + "windows-sys", +] + [[package]] name = "iovec" version = "0.1.4" @@ -3527,6 +3580,18 @@ dependencies = [ "move-ir-types", ] +[[package]] +name = "is-terminal" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +dependencies = [ + "hermit-abi 0.2.6", + "io-lifetimes", + "rustix", + "windows-sys", +] + [[package]] name = "itertools" version = "0.7.11" @@ -3747,9 +3812,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.80" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libfuzzer-sys" @@ -3799,6 +3864,12 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + [[package]] name = "lock_api" version = "0.4.1" @@ -3825,7 +3896,7 @@ dependencies = [ "channel", "diem-workspace-hack", "futures 0.3.8", - "structopt 0.3.21", + "structopt", ] [[package]] @@ -4012,7 +4083,7 @@ dependencies = [ "once_cell", "resource-viewer", "stdlib", - "structopt 0.3.21", + "structopt", "vm", "vm-genesis", ] @@ -4059,7 +4130,7 @@ dependencies = [ "once_cell", "petgraph", "serde", - "structopt 0.3.21", + "structopt", "vm", ] @@ -4072,7 +4143,7 @@ dependencies = [ "errmapgen", "libra-canonical-serialization", "move-core-types", - "structopt 0.3.21", + "structopt", ] [[package]] @@ -4110,7 +4181,7 @@ dependencies = [ "move-ir-types", "petgraph", "regex", - "structopt 0.3.21", + "structopt", "tempfile", "vm", "walkdir", @@ -4604,7 +4675,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.17", "libc", ] @@ -4706,7 +4777,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall", + "redox_syscall 0.1.57", "smallvec", "winapi 0.3.9", ] @@ -4912,24 +4983,24 @@ dependencies = [ [[package]] name = "prettydiff" -version = "0.3.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5240be0c9ea1bc7887819a36264cb9475eb71c58749808e5b989c8c1fdc67acf" +checksum = "d593ade80c7e334ad6bffbe003afac07948b88a0ae41aa321a5cd87abf260928" dependencies = [ - "ansi_term 0.9.0", + "ansi_term 0.12.1", "prettytable-rs", - "structopt 0.2.18", + "structopt", ] [[package]] name = "prettytable-rs" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e" +checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" dependencies = [ - "atty", "csv", "encode_unicode", + "is-terminal", "lazy_static", "term", "unicode-width", @@ -5349,13 +5420,22 @@ version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + [[package]] name = "redox_termios" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" dependencies = [ - "redox_syscall", + "redox_syscall 0.1.57", ] [[package]] @@ -5365,10 +5445,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" dependencies = [ "getrandom 0.1.15", - "redox_syscall", + "redox_syscall 0.1.57", "rust-argon2", ] +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom 0.2.0", + "redox_syscall 0.2.16", + "thiserror", +] + [[package]] name = "ref-cast" version = "1.0.3" @@ -5684,6 +5775,26 @@ dependencies = [ "semver 0.9.0", ] +[[package]] +name = "rustix" +version = "0.36.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "rustversion" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" + [[package]] name = "rusty-fork" version = "0.3.0" @@ -5858,7 +5969,7 @@ dependencies = [ "libra-canonical-serialization", "rand 0.7.3", "serde_yaml", - "structopt 0.3.21", + "structopt", "thiserror", ] @@ -5920,7 +6031,7 @@ dependencies = [ "serde-reflection", "serde_bytes", "serde_yaml", - "structopt 0.3.21", + "structopt", "textwrap 0.12.1", ] @@ -6255,7 +6366,7 @@ checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44" dependencies = [ "cfg-if 0.1.10", "libc", - "redox_syscall", + "redox_syscall 0.1.57", "winapi 0.3.9", ] @@ -6500,16 +6611,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -[[package]] -name = "structopt" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" -dependencies = [ - "clap", - "structopt-derive 0.2.18", -] - [[package]] name = "structopt" version = "0.3.21" @@ -6518,19 +6619,7 @@ checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" dependencies = [ "clap", "lazy_static", - "structopt-derive 0.4.14", -] - -[[package]] -name = "structopt-derive" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" -dependencies = [ - "heck", - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", + "structopt-derive", ] [[package]] @@ -6581,7 +6670,7 @@ dependencies = [ "rand 0.7.3", "serde", "serde_json", - "structopt 0.3.21", + "structopt", "transaction-builder", ] @@ -6644,19 +6733,19 @@ dependencies = [ "cfg-if 0.1.10", "libc", "rand 0.7.3", - "redox_syscall", + "redox_syscall 0.1.57", "remove_dir_all", "winapi 0.3.9", ] [[package]] name = "term" -version = "0.5.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" dependencies = [ - "byteorder", - "dirs 1.0.5", + "dirs-next", + "rustversion", "winapi 0.3.9", ] @@ -6687,7 +6776,7 @@ checksum = "c22cec9d8978d906be5ac94bceb5a010d885c626c4c8855721a4dbd20e3ac905" dependencies = [ "libc", "numtoa", - "redox_syscall", + "redox_syscall 0.1.57", "redox_termios", ] @@ -6714,7 +6803,7 @@ dependencies = [ "move-vm-types", "num_cpus", "rand 0.7.3", - "structopt 0.3.21", + "structopt", "vm", ] @@ -7040,7 +7129,7 @@ dependencies = [ "serde-generate", "serde-reflection", "serde_yaml", - "structopt 0.3.21", + "structopt", "tempfile", "textwrap 0.12.1", "which 4.0.2", @@ -7547,6 +7636,63 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + [[package]] name = "winreg" version = "0.7.0" @@ -7591,7 +7737,7 @@ dependencies = [ "regex", "serde", "serde_json", - "structopt 0.3.21", + "structopt", "toml", "x-core", "x-lint", diff --git a/language/move-prover/test-utils/Cargo.toml b/language/move-prover/test-utils/Cargo.toml index 44d88215d15a..ded1e3e7ef4d 100644 --- a/language/move-prover/test-utils/Cargo.toml +++ b/language/move-prover/test-utils/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" license = "Apache-2.0" [dependencies] -prettydiff = "0.3.1" +prettydiff = "0.6.2" anyhow = "1.0.34" regex = "1.4.2" diem-workspace-hack = { path = "../../../common/workspace-hack", version = "0.1.0" }