Merge pull request #233434 from figsoda/topiary

topiary: 0.1.0 -> 0.2.0

Changed files
+851 -172
pkgs
development
tools
misc
+822 -164
pkgs/development/tools/misc/topiary/Cargo.lock
···
version = 3
[[package]]
-
name = "Inflector"
-
version = "0.11.4"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-
-
[[package]]
name = "aho-corasick"
version = "0.7.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
]
[[package]]
-
name = "aliasable"
-
version = "0.1.3"
+
name = "anes"
+
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
[[package]]
-
name = "anes"
-
version = "0.1.6"
+
name = "ansi_term"
+
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+
dependencies = [
+
"winapi",
+
]
+
+
[[package]]
+
name = "anstream"
+
version = "0.2.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f"
+
dependencies = [
+
"anstyle",
+
"anstyle-parse",
+
"anstyle-wincon",
+
"concolor-override",
+
"concolor-query",
+
"is-terminal",
+
"utf8parse",
+
]
+
+
[[package]]
+
name = "anstyle"
+
version = "0.3.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2"
+
+
[[package]]
+
name = "anstyle-parse"
+
version = "0.1.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116"
+
dependencies = [
+
"utf8parse",
+
]
+
+
[[package]]
+
name = "anstyle-wincon"
+
version = "0.2.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa"
+
dependencies = [
+
"anstyle",
+
"windows-sys 0.45.0",
+
]
[[package]]
name = "assert_cmd"
-
version = "2.0.8"
+
version = "2.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "9834fcc22e0874394a010230586367d4a3e9f11b560f469262678547e1d2575e"
+
checksum = "ec0b2340f55d9661d76793b2bfc2eb0e62689bd79d067a95707ea762afd5e9dd"
dependencies = [
+
"anstyle",
"bstr",
"doc-comment",
"predicates",
···
]
[[package]]
+
name = "async-stream"
+
version = "0.3.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+
dependencies = [
+
"async-stream-impl",
+
"futures-core",
+
"pin-project-lite",
+
]
+
+
[[package]]
+
name = "async-stream-impl"
+
version = "0.3.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+
dependencies = [
+
"proc-macro2",
+
"quote",
+
"syn 2.0.13",
+
]
+
+
[[package]]
name = "atty"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "bstr"
-
version = "1.3.0"
+
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1"
+
checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09"
dependencies = [
"memchr",
"once_cell",
···
checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
[[package]]
+
name = "bytes"
+
version = "1.4.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+
+
[[package]]
name = "cast"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "clap"
+
version = "2.34.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+
dependencies = [
+
"ansi_term",
+
"atty",
+
"bitflags",
+
"strsim 0.8.0",
+
"textwrap 0.11.0",
+
"unicode-width",
+
"vec_map",
+
]
+
+
[[package]]
+
name = "clap"
version = "3.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
dependencies = [
-
"atty",
"bitflags",
+
"clap_lex 0.2.4",
+
"indexmap",
+
"textwrap 0.16.0",
+
]
+
+
[[package]]
+
name = "clap"
+
version = "4.2.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3"
+
dependencies = [
+
"clap_builder",
"clap_derive",
-
"clap_lex",
-
"indexmap",
"once_cell",
-
"strsim",
-
"termcolor",
-
"textwrap",
+
]
+
+
[[package]]
+
name = "clap_builder"
+
version = "4.2.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f"
+
dependencies = [
+
"anstream",
+
"anstyle",
+
"bitflags",
+
"clap_lex 0.4.1",
+
"strsim 0.10.0",
]
[[package]]
name = "clap_derive"
-
version = "3.2.18"
+
version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+
checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
dependencies = [
-
"heck",
-
"proc-macro-error",
+
"heck 0.4.1",
"proc-macro2",
"quote",
-
"syn",
+
"syn 2.0.13",
]
[[package]]
···
]
[[package]]
+
name = "clap_lex"
+
version = "0.4.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
+
+
[[package]]
+
name = "concolor-override"
+
version = "1.0.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f"
+
+
[[package]]
+
name = "concolor-query"
+
version = "0.3.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf"
+
dependencies = [
+
"windows-sys 0.45.0",
+
]
+
+
[[package]]
name = "criterion"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
"atty",
"cast",
"ciborium",
-
"clap",
+
"clap 3.2.23",
"criterion-plot",
+
"futures",
"itertools",
"lazy_static",
"num-traits",
···
]
[[package]]
+
name = "csv"
+
version = "1.2.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad"
+
dependencies = [
+
"csv-core",
+
"itoa",
+
"ryu",
+
"serde",
+
]
+
+
[[package]]
+
name = "csv-core"
+
version = "0.1.10"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+
dependencies = [
+
"memchr",
+
]
+
+
[[package]]
name = "ctor"
version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
dependencies = [
"quote",
-
"syn",
+
"syn 1.0.109",
]
[[package]]
···
checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
[[package]]
+
name = "dirs-next"
+
version = "2.0.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+
dependencies = [
+
"cfg-if",
+
"dirs-sys-next",
+
]
+
+
[[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",
+
"winapi",
+
]
+
+
[[package]]
name = "doc-comment"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]]
+
name = "encode_unicode"
+
version = "1.0.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+
+
[[package]]
name = "env_logger"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "errno"
-
version = "0.2.8"
+
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+
checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0"
dependencies = [
"errno-dragonfly",
"libc",
-
"winapi",
+
"windows-sys 0.45.0",
]
[[package]]
···
]
[[package]]
+
name = "futures"
+
version = "0.3.28"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+
dependencies = [
+
"futures-channel",
+
"futures-core",
+
"futures-executor",
+
"futures-io",
+
"futures-sink",
+
"futures-task",
+
"futures-util",
+
]
+
+
[[package]]
+
name = "futures-channel"
+
version = "0.3.28"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+
dependencies = [
+
"futures-core",
+
"futures-sink",
+
]
+
+
[[package]]
+
name = "futures-core"
+
version = "0.3.28"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+
+
[[package]]
+
name = "futures-executor"
+
version = "0.3.28"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+
dependencies = [
+
"futures-core",
+
"futures-task",
+
"futures-util",
+
]
+
+
[[package]]
+
name = "futures-io"
+
version = "0.3.28"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+
+
[[package]]
+
name = "futures-macro"
+
version = "0.3.28"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+
dependencies = [
+
"proc-macro2",
+
"quote",
+
"syn 2.0.13",
+
]
+
+
[[package]]
+
name = "futures-sink"
+
version = "0.3.28"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+
+
[[package]]
+
name = "futures-task"
+
version = "0.3.28"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+
+
[[package]]
+
name = "futures-util"
+
version = "0.3.28"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+
dependencies = [
+
"futures-channel",
+
"futures-core",
+
"futures-io",
+
"futures-macro",
+
"futures-sink",
+
"futures-task",
+
"memchr",
+
"pin-project-lite",
+
"pin-utils",
+
"slab",
+
]
+
+
[[package]]
+
name = "getrandom"
+
version = "0.2.8"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+
dependencies = [
+
"cfg-if",
+
"libc",
+
"wasi",
+
]
+
+
[[package]]
name = "half"
version = "1.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "heck"
+
version = "0.3.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+
dependencies = [
+
"unicode-segmentation",
+
]
+
+
[[package]]
+
name = "heck"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
···
[[package]]
name = "indexmap"
-
version = "1.9.2"
+
version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
"hashbrown",
···
[[package]]
name = "io-lifetimes"
-
version = "1.0.5"
+
version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
+
checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
dependencies = [
+
"hermit-abi 0.3.1",
"libc",
-
"windows-sys 0.45.0",
+
"windows-sys 0.48.0",
]
[[package]]
name = "is-terminal"
-
version = "0.4.4"
+
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857"
+
checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8"
dependencies = [
"hermit-abi 0.3.1",
"io-lifetimes",
···
[[package]]
name = "itoa"
-
version = "1.0.5"
+
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+
checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
[[package]]
name = "js-sys"
···
[[package]]
name = "libc"
-
version = "0.2.139"
+
version = "0.2.141"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+
checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
[[package]]
name = "linux-raw-sys"
-
version = "0.1.4"
+
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+
checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
[[package]]
name = "log"
···
[[package]]
name = "os_str_bytes"
-
version = "6.4.1"
+
version = "6.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+
checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
[[package]]
-
name = "ouroboros"
-
version = "0.15.6"
+
name = "output_vt100"
+
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db"
+
checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
dependencies = [
-
"aliasable",
-
"ouroboros_macro",
+
"winapi",
]
[[package]]
-
name = "ouroboros_macro"
-
version = "0.15.6"
+
name = "pad"
+
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7"
+
checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3"
dependencies = [
-
"Inflector",
-
"proc-macro-error",
-
"proc-macro2",
-
"quote",
-
"syn",
+
"unicode-width",
]
[[package]]
-
name = "output_vt100"
-
version = "0.1.3"
+
name = "pin-project-lite"
+
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
-
dependencies = [
-
"winapi",
-
]
+
checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+
+
[[package]]
+
name = "pin-utils"
+
version = "0.1.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "plotters"
···
[[package]]
name = "predicates"
-
version = "2.1.5"
+
version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd"
+
checksum = "c575290b64d24745b6c57a12a31465f0a66f3a4799686a6921526a33b0797965"
dependencies = [
+
"anstyle",
"difflib",
"itertools",
"predicates-core",
···
[[package]]
name = "predicates-core"
-
version = "1.0.5"
+
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2"
+
checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
[[package]]
name = "predicates-tree"
-
version = "1.0.7"
+
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d"
+
checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
dependencies = [
"predicates-core",
"termtree",
···
]
[[package]]
+
name = "prettydiff"
+
version = "0.6.4"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8ff1fec61082821f8236cf6c0c14e8172b62ce8a72a0eedc30d3b247bb68dc11"
+
dependencies = [
+
"ansi_term",
+
"pad",
+
"prettytable-rs",
+
"structopt",
+
]
+
+
[[package]]
+
name = "prettytable-rs"
+
version = "0.10.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a"
+
dependencies = [
+
"csv",
+
"encode_unicode",
+
"is-terminal",
+
"lazy_static",
+
"term",
+
"unicode-width",
+
]
+
+
[[package]]
name = "proc-macro-error"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
"proc-macro-error-attr",
"proc-macro2",
"quote",
-
"syn",
+
"syn 1.0.109",
"version_check",
]
···
[[package]]
name = "proc-macro2"
-
version = "1.0.51"
+
version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
+
checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
-
version = "1.0.23"
+
version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+
checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rayon"
-
version = "1.6.1"
+
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
+
checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
dependencies = [
"either",
"rayon-core",
···
[[package]]
name = "rayon-core"
-
version = "1.10.2"
+
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b"
+
checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
···
]
[[package]]
+
name = "redox_syscall"
+
version = "0.3.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+
dependencies = [
+
"bitflags",
+
]
+
+
[[package]]
+
name = "redox_users"
+
version = "0.4.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+
dependencies = [
+
"getrandom",
+
"redox_syscall 0.2.16",
+
"thiserror",
+
]
+
+
[[package]]
name = "regex"
-
version = "1.7.1"
+
version = "1.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
+
checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
dependencies = [
"aho-corasick",
"memchr",
···
[[package]]
name = "regex-syntax"
-
version = "0.6.28"
+
version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "rustix"
-
version = "0.36.8"
+
version = "0.37.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
+
checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d"
dependencies = [
"bitflags",
"errno",
···
]
[[package]]
-
name = "ryu"
+
name = "rustversion"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+
checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+
+
[[package]]
+
name = "ryu"
+
version = "1.0.13"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
[[package]]
name = "same-file"
···
[[package]]
name = "serde"
-
version = "1.0.152"
+
version = "1.0.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+
checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-
version = "1.0.152"
+
version = "1.0.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+
checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
dependencies = [
"proc-macro2",
"quote",
-
"syn",
+
"syn 2.0.13",
]
[[package]]
name = "serde_json"
-
version = "1.0.93"
+
version = "1.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
+
checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
dependencies = [
"itoa",
"ryu",
···
]
[[package]]
+
name = "serde_spanned"
+
version = "0.6.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+
dependencies = [
+
"serde",
+
]
+
+
[[package]]
+
name = "slab"
+
version = "0.4.8"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+
dependencies = [
+
"autocfg",
+
]
+
+
[[package]]
+
name = "strsim"
+
version = "0.8.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+
[[package]]
name = "strsim"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
+
name = "structopt"
+
version = "0.3.26"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
+
dependencies = [
+
"clap 2.34.0",
+
"lazy_static",
+
"structopt-derive",
+
]
+
+
[[package]]
+
name = "structopt-derive"
+
version = "0.4.18"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
+
dependencies = [
+
"heck 0.3.3",
+
"proc-macro-error",
+
"proc-macro2",
+
"quote",
+
"syn 1.0.109",
+
]
+
+
[[package]]
name = "syn"
version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
]
[[package]]
+
name = "syn"
+
version = "2.0.13"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
+
dependencies = [
+
"proc-macro2",
+
"quote",
+
"unicode-ident",
+
]
+
+
[[package]]
name = "tempfile"
-
version = "3.4.0"
+
version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
+
checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
dependencies = [
"cfg-if",
"fastrand",
-
"redox_syscall",
+
"redox_syscall 0.3.5",
"rustix",
-
"windows-sys 0.42.0",
+
"windows-sys 0.45.0",
+
]
+
+
[[package]]
+
name = "term"
+
version = "0.7.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
+
dependencies = [
+
"dirs-next",
+
"rustversion",
+
"winapi",
]
[[package]]
···
[[package]]
name = "termtree"
-
version = "0.4.0"
+
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8"
+
checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
[[package]]
-
name = "test-log"
-
version = "0.2.11"
+
name = "textwrap"
+
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "38f0c854faeb68a048f0f2dc410c5ddae3bf83854ef0e4977d58306a5edef50e"
+
checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
dependencies = [
-
"proc-macro2",
-
"quote",
-
"syn",
+
"unicode-width",
]
[[package]]
···
checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
[[package]]
+
name = "thiserror"
+
version = "1.0.40"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+
dependencies = [
+
"thiserror-impl",
+
]
+
+
[[package]]
+
name = "thiserror-impl"
+
version = "1.0.40"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+
dependencies = [
+
"proc-macro2",
+
"quote",
+
"syn 2.0.13",
+
]
+
+
[[package]]
name = "tinytemplate"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
]
[[package]]
+
name = "tokio"
+
version = "1.27.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
+
dependencies = [
+
"autocfg",
+
"num_cpus",
+
"pin-project-lite",
+
"tokio-macros",
+
"windows-sys 0.45.0",
+
]
+
+
[[package]]
+
name = "tokio-macros"
+
version = "2.0.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
+
dependencies = [
+
"proc-macro2",
+
"quote",
+
"syn 2.0.13",
+
]
+
+
[[package]]
+
name = "tokio-stream"
+
version = "0.1.12"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313"
+
dependencies = [
+
"futures-core",
+
"pin-project-lite",
+
"tokio",
+
]
+
+
[[package]]
+
name = "tokio-test"
+
version = "0.4.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3"
+
dependencies = [
+
"async-stream",
+
"bytes",
+
"futures-core",
+
"tokio",
+
"tokio-stream",
+
]
+
+
[[package]]
+
name = "toml"
+
version = "0.7.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
+
dependencies = [
+
"serde",
+
"serde_spanned",
+
"toml_datetime",
+
"toml_edit",
+
]
+
+
[[package]]
+
name = "toml_datetime"
+
version = "0.6.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+
dependencies = [
+
"serde",
+
]
+
+
[[package]]
+
name = "toml_edit"
+
version = "0.19.8"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+
dependencies = [
+
"indexmap",
+
"serde",
+
"serde_spanned",
+
"toml_datetime",
+
"winnow",
+
]
+
+
[[package]]
name = "topiary"
-
version = "0.1.0"
+
version = "0.2.0"
dependencies = [
-
"assert_cmd",
-
"clap",
"criterion",
-
"env_logger",
+
"futures",
"itertools",
"log",
-
"ouroboros",
"pretty_assertions",
+
"prettydiff",
+
"regex",
"serde",
"serde_json",
-
"tempfile",
-
"test-log",
-
"tree-sitter",
+
"tokio",
+
"tokio-test",
+
"toml",
"tree-sitter-bash",
+
"tree-sitter-facade",
"tree-sitter-json",
"tree-sitter-nickel",
"tree-sitter-ocaml",
"tree-sitter-query",
"tree-sitter-rust",
"tree-sitter-toml",
+
"unescape",
+
"web-tree-sitter-sys",
+
]
+
+
[[package]]
+
name = "topiary-cli"
+
version = "0.2.0"
+
dependencies = [
+
"assert_cmd",
+
"clap 4.2.1",
+
"env_logger",
+
"log",
+
"tempfile",
+
"tokio",
+
"toml",
+
"topiary",
+
]
+
+
[[package]]
+
name = "topiary-playground"
+
version = "0.0.1"
+
dependencies = [
+
"cfg-if",
+
"itertools",
+
"topiary",
+
"tree-sitter-facade",
+
"wasm-bindgen",
+
"wasm-bindgen-futures",
]
[[package]]
name = "tree-sitter"
-
version = "0.20.9"
+
version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d4423c784fe11398ca91e505cdc71356b07b1a924fc8735cfab5333afe3e18bc"
+
checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"
dependencies = [
"cc",
"regex",
···
[[package]]
name = "tree-sitter-bash"
version = "0.19.0"
-
source = "git+https://github.com/tree-sitter/tree-sitter-bash#7f9506c34ab6a0f4e3e052b7a49cbeef91f71236"
+
source = "git+https://github.com/tree-sitter/tree-sitter-bash#b338fa9f4807b9e0336cd4dde04948a8c324a4cf"
dependencies = [
"cc",
"tree-sitter",
]
[[package]]
+
name = "tree-sitter-facade"
+
version = "0.9.3"
+
source = "git+https://github.com/tweag/tree-sitter-facade#1b290e795e700a57d8bd303f98a9715ab1c4f598"
+
dependencies = [
+
"js-sys",
+
"tree-sitter",
+
"wasm-bindgen",
+
"web-sys",
+
"web-tree-sitter-sys",
+
]
+
+
[[package]]
name = "tree-sitter-json"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "tree-sitter-nickel"
version = "0.0.1"
-
source = "git+https://github.com/nickel-lang/tree-sitter-nickel#d6c7eeb751038f934b5b1aa7ff236376d0235c56"
+
source = "git+https://github.com/nickel-lang/tree-sitter-nickel?rev=cf1c52a53a527505515add41da90f8a575798987#cf1c52a53a527505515add41da90f8a575798987"
dependencies = [
"cc",
"tree-sitter",
···
[[package]]
name = "tree-sitter-query"
-
version = "0.0.1"
-
source = "git+https://github.com/nvim-treesitter/tree-sitter-query#0717de07078a20a8608c98ad5f26c208949d0e15"
+
version = "0.1.0"
+
source = "git+https://github.com/nvim-treesitter/tree-sitter-query#e97504446f14f529d5a8e649667d3d60391e4dfd"
dependencies = [
"cc",
"tree-sitter",
···
]
[[package]]
+
name = "unescape"
+
version = "0.1.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e"
+
+
[[package]]
name = "unicode-ident"
-
version = "1.0.6"
+
version = "1.0.8"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+
+
[[package]]
+
name = "unicode-segmentation"
+
version = "1.10.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+
+
[[package]]
+
name = "unicode-width"
+
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
+
[[package]]
+
name = "utf8parse"
+
version = "0.2.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
+
[[package]]
+
name = "vec_map"
+
version = "0.8.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "version_check"
···
[[package]]
name = "walkdir"
-
version = "2.3.2"
+
version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+
checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
dependencies = [
"same-file",
-
"winapi",
"winapi-util",
]
+
+
[[package]]
+
name = "wasi"
+
version = "0.11.0+wasi-snapshot-preview1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
···
"once_cell",
"proc-macro2",
"quote",
-
"syn",
+
"syn 1.0.109",
"wasm-bindgen-shared",
[[package]]
+
name = "wasm-bindgen-futures"
+
version = "0.4.34"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
+
dependencies = [
+
"cfg-if",
+
"js-sys",
+
"wasm-bindgen",
+
"web-sys",
+
]
+
+
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
dependencies = [
"proc-macro2",
"quote",
-
"syn",
+
"syn 1.0.109",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
···
[[package]]
+
name = "web-tree-sitter-sys"
+
version = "1.3.0"
+
source = "git+https://github.com/tweag/web-tree-sitter-sys#9e9755b9ab59055092de4717ba0bafe6483f4e5c"
+
dependencies = [
+
"js-sys",
+
"wasm-bindgen",
+
"wasm-bindgen-futures",
+
"web-sys",
+
]
+
+
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "windows-sys"
-
version = "0.42.0"
+
version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
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",
+
"windows-targets 0.42.2",
[[package]]
name = "windows-sys"
-
version = "0.45.0"
+
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
-
"windows-targets",
+
"windows-targets 0.48.0",
[[package]]
name = "windows-targets"
-
version = "0.42.1"
+
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
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",
+
"windows_aarch64_gnullvm 0.42.2",
+
"windows_aarch64_msvc 0.42.2",
+
"windows_i686_gnu 0.42.2",
+
"windows_i686_msvc 0.42.2",
+
"windows_x86_64_gnu 0.42.2",
+
"windows_x86_64_gnullvm 0.42.2",
+
"windows_x86_64_msvc 0.42.2",
+
]
+
+
[[package]]
+
name = "windows-targets"
+
version = "0.48.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+
dependencies = [
+
"windows_aarch64_gnullvm 0.48.0",
+
"windows_aarch64_msvc 0.48.0",
+
"windows_i686_gnu 0.48.0",
+
"windows_i686_msvc 0.48.0",
+
"windows_x86_64_gnu 0.48.0",
+
"windows_x86_64_gnullvm 0.48.0",
+
"windows_x86_64_msvc 0.48.0",
[[package]]
name = "windows_aarch64_gnullvm"
-
version = "0.42.1"
+
version = "0.42.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+
[[package]]
+
name = "windows_aarch64_gnullvm"
+
version = "0.48.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+
+
[[package]]
+
name = "windows_aarch64_msvc"
+
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_aarch64_msvc"
-
version = "0.42.1"
+
version = "0.48.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+
+
[[package]]
+
name = "windows_i686_gnu"
+
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_gnu"
-
version = "0.42.1"
+
version = "0.48.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+
+
[[package]]
+
name = "windows_i686_msvc"
+
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_i686_msvc"
-
version = "0.42.1"
+
version = "0.48.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+
+
[[package]]
+
name = "windows_x86_64_gnu"
+
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnu"
-
version = "0.42.1"
+
version = "0.48.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
+
[[package]]
+
name = "windows_x86_64_gnullvm"
+
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_gnullvm"
-
version = "0.42.1"
+
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
-
version = "0.42.1"
+
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+
[[package]]
+
name = "windows_x86_64_msvc"
+
version = "0.48.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+
[[package]]
+
name = "winnow"
+
version = "0.4.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
+
dependencies = [
+
"memchr",
+
]
[[package]]
name = "yansi"
+29 -8
pkgs/development/tools/misc/topiary/default.nix
···
-
{ lib, rustPlatform, fetchFromGitHub }:
+
{ lib
+
, rustPlatform
+
, fetchFromGitHub
+
, fetchpatch
+
}:
rustPlatform.buildRustPackage rec {
pname = "topiary";
-
version = "0.1.0";
+
version = "0.2.0";
src = fetchFromGitHub {
owner = "tweag";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-Gm6AzzVLUXZi2jzJ1b/c4yjIvRRA2e5mC2CMVyly2X8=";
+
hash = "sha256-OJdR+8eGbcDjirupjcczztYbGKGKaRywZnqqjv0EOSU=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
-
"tree-sitter-bash-0.19.0" = "sha256-5gBH0tBnNevAdBwlsLQAI9JOyz2lDY7Gb54HVCD4+Zs=";
-
"tree-sitter-nickel-0.0.1" = "sha256-D/RRwXsWyHMxoU7Z8VVJ6jn7zUFKaKusLT/ofON7sOE=";
+
"tree-sitter-bash-0.19.0" = "sha256-Po2r+wUWJwC+ODk/xotYI7PsmjC3TFSu1dU0FrrnAXQ=";
+
"tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs=";
+
"tree-sitter-nickel-0.0.1" = "sha256-NLgbTl1Te/lHTGra4DdxLtqIg6yXf5lfyl37qpp8SNQ=";
"tree-sitter-ocaml-0.20.1" = "sha256-5X2c2Deb8xNlp0LPQKFWIT3jwxKuuKdFlp9b3iA818Y=";
-
"tree-sitter-query-0.0.1" = "sha256-dWWof8rYFTto3A4BfbKTKcNieRbwFdF6xDXW9tQvAqQ=";
+
"tree-sitter-query-0.1.0" = "sha256-Gv882sbL2fmR++h4/I7dFCp+g6pddRCaLyX7+loEoHU=";
+
"web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M=";
};
};
+
patches = [
+
# the versions in `Cargo.toml`s are outdated
+
(fetchpatch {
+
name = "bump-version-to-0.2.0.patch";
+
url = "https://github.com/tweag/topiary/commit/612fdb64f50ab15889a0b508bf727f159f26a112.patch";
+
hash = "sha256-MHaAnYyjXdKbh/pE3bL2iAPX6bMQkK+LUGYCL5mBM44=";
+
})
+
];
+
+
cargoBuildFlags = [ "-p" "topiary-cli" ];
+
cargoTestFlags = cargoBuildFlags;
+
+
env = {
+
TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/languages";
+
};
+
postInstall = ''
install -Dm444 languages/* -t $out/share/languages
'';
-
TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/languages";
-
meta = with lib; {
description = "A uniform formatter for simple languages, as part of the Tree-sitter ecosystem";
homepage = "https://github.com/tweag/topiary";
+
changelog = "https://github.com/tweag/topiary/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};