diff --git a/Cargo.lock b/Cargo.lock
index 7e0676b094..6c5d4858ba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,46 +2,40 @@
# It is not intended for manual editing.
version = 3
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
[[package]]
name = "ahash"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
- "getrandom 0.2.7",
+ "getrandom",
"once_cell",
"version_check",
]
[[package]]
name = "aho-corasick"
-version = "0.7.18"
+version = "0.7.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
dependencies = [
"memchr",
]
[[package]]
name = "android_system_properties"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
dependencies = [
"libc",
]
[[package]]
name = "anyhow"
-version = "1.0.60"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c794e162a5eff65c72ef524dfe393eb923c354e350bb78b9c7383df13f3bc142"
+checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
[[package]]
name = "ascii-canvas"
@@ -52,131 +46,6 @@ dependencies = [
"term",
]
-[[package]]
-name = "async-channel"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b31b87a3367ed04dbcbc252bce3f2a8172fef861d47177524c503c908dff2c6"
-dependencies = [
- "concurrent-queue",
- "event-listener",
- "futures-core",
-]
-
-[[package]]
-name = "async-executor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965"
-dependencies = [
- "async-task",
- "concurrent-queue",
- "fastrand",
- "futures-lite",
- "once_cell",
- "slab",
-]
-
-[[package]]
-name = "async-global-executor"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5262ed948da60dd8956c6c5aca4d4163593dddb7b32d73267c93dab7b2e98940"
-dependencies = [
- "async-channel",
- "async-executor",
- "async-io",
- "async-lock",
- "blocking",
- "futures-lite",
- "num_cpus",
- "once_cell",
-]
-
-[[package]]
-name = "async-io"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5e18f61464ae81cde0a23e713ae8fd299580c54d697a35820cfd0625b8b0e07"
-dependencies = [
- "concurrent-queue",
- "futures-lite",
- "libc",
- "log",
- "once_cell",
- "parking",
- "polling",
- "slab",
- "socket2",
- "waker-fn",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "async-lock"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6"
-dependencies = [
- "event-listener",
-]
-
-[[package]]
-name = "async-process"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c"
-dependencies = [
- "async-io",
- "blocking",
- "cfg-if 1.0.0",
- "event-listener",
- "futures-lite",
- "libc",
- "once_cell",
- "signal-hook",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "async-std"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
-dependencies = [
- "async-channel",
- "async-global-executor",
- "async-io",
- "async-lock",
- "async-process",
- "crossbeam-utils",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-lite",
- "gloo-timers",
- "kv-log-macro",
- "log",
- "memchr",
- "once_cell",
- "pin-project-lite",
- "pin-utils",
- "slab",
- "wasm-bindgen-futures",
-]
-
-[[package]]
-name = "async-task"
-version = "4.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
-
-[[package]]
-name = "atomic-waker"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
-
[[package]]
name = "atty"
version = "0.2.14"
@@ -185,7 +54,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi",
"libc",
- "winapi 0.3.9",
+ "winapi",
]
[[package]]
@@ -194,21 +63,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-[[package]]
-name = "base64"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
[[package]]
name = "bincode"
version = "1.3.3"
@@ -239,50 +93,6 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array 0.14.6",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
-]
-
-[[package]]
-name = "blocking"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc"
-dependencies = [
- "async-channel",
- "async-task",
- "atomic-waker",
- "fastrand",
- "futures-lite",
- "once_cell",
-]
-
[[package]]
name = "bstr"
version = "0.2.17"
@@ -296,62 +106,9 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.10.0"
+version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "cacache"
-version = "10.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c13caedf5b624de6448b78e980320a27266557350198dc67cf64bc8561c27e8"
-dependencies = [
- "async-std",
- "digest 0.9.0",
- "either",
- "futures",
- "hex 0.4.3",
- "memmap2",
- "serde",
- "serde_derive",
- "serde_json",
- "sha-1 0.9.8",
- "sha2 0.9.9",
- "ssri",
- "tempfile",
- "thiserror",
- "walkdir",
-]
-
-[[package]]
-name = "cache-padded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
-
-[[package]]
-name = "cc"
-version = "1.0.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
[[package]]
name = "cfg-if"
@@ -361,9 +118,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
-version = "0.4.21"
+version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f725f340c3854e3cb3ab736dc21f0cca183303acea3b3ffec30f141503ac8eb"
+checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
dependencies = [
"iana-time-zone",
"js-sys",
@@ -371,91 +128,7 @@ dependencies = [
"num-traits",
"time",
"wasm-bindgen",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "chunked_transfer"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e"
-
-[[package]]
-name = "clap"
-version = "3.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3dbbb6653e7c55cc8595ad3e1f7be8f32aba4eb7ff7f0fd1163d4f3d137c0a9"
-dependencies = [
- "atty",
- "bitflags",
- "clap_derive",
- "clap_lex",
- "indexmap",
- "once_cell",
- "strsim",
- "termcolor",
- "textwrap",
-]
-
-[[package]]
-name = "clap_derive"
-version = "3.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
-
-[[package]]
-name = "clearscreen"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c969a6b6dadff9f3349b1f783f553e2411104763ca4789e1c6ca6a41f46a57b0"
-dependencies = [
- "nix",
- "terminfo",
- "thiserror",
- "which",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "colored"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
-dependencies = [
- "atty",
- "lazy_static",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "common-path"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101"
-
-[[package]]
-name = "concurrent-queue"
-version = "1.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
-dependencies = [
- "cache-padded",
+ "winapi",
]
[[package]]
@@ -468,17 +141,7 @@ dependencies = [
"libc",
"once_cell",
"terminal_size",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys",
- "libc",
+ "winapi",
]
[[package]]
@@ -487,31 +150,13 @@ version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-[[package]]
-name = "cpufeatures"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
[[package]]
name = "crossbeam-channel"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"crossbeam-utils",
]
@@ -521,7 +166,7 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"crossbeam-epoch",
"crossbeam-utils",
]
@@ -533,7 +178,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1"
dependencies = [
"autocfg",
- "cfg-if 1.0.0",
+ "cfg-if",
"crossbeam-utils",
"memoffset",
"once_cell",
@@ -546,7 +191,7 @@ version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"once_cell",
]
@@ -556,89 +201,22 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-[[package]]
-name = "ctor"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb"
-dependencies = [
- "quote",
- "syn",
-]
-
[[package]]
name = "diff"
version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array 0.14.6",
-]
-
-[[package]]
-name = "directories"
-version = "4.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
-dependencies = [
- "cfg-if 0.1.10",
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
-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",
+ "cfg-if",
"dirs-sys-next",
]
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi 0.3.9",
-]
-
[[package]]
name = "dirs-sys-next"
version = "0.1.2"
@@ -647,14 +225,14 @@ checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
dependencies = [
"libc",
"redox_users",
- "winapi 0.3.9",
+ "winapi",
]
[[package]]
name = "either"
-version = "1.7.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be"
+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
[[package]]
name = "ena"
@@ -671,27 +249,6 @@ version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-[[package]]
-name = "event-listener"
-version = "2.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
-[[package]]
-name = "fastrand"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
-dependencies = [
- "instant",
-]
-
[[package]]
name = "fern"
version = "0.6.1"
@@ -707,7 +264,7 @@ version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"libc",
"redox_syscall",
"windows-sys",
@@ -719,208 +276,13 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-[[package]]
-name = "flate2"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
-dependencies = [
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "fsevent"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6"
-dependencies = [
- "bitflags",
- "fsevent-sys",
-]
-
-[[package]]
-name = "fsevent-sys"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
-[[package]]
-name = "futures"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
-
-[[package]]
-name = "futures-lite"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
-dependencies = [
- "fastrand",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
-
-[[package]]
-name = "futures-macro"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
-
-[[package]]
-name = "futures-task"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
-
-[[package]]
-name = "futures-util"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
[[package]]
name = "getrandom"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"libc",
"wasi 0.11.0+wasi-snapshot-preview1",
]
@@ -931,30 +293,12 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-[[package]]
-name = "gloo-timers"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9"
-dependencies = [
- "futures-channel",
- "futures-core",
- "js-sys",
- "wasm-bindgen",
-]
-
[[package]]
name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-[[package]]
-name = "heck"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
-
[[package]]
name = "hermit-abi"
version = "0.1.19"
@@ -964,40 +308,18 @@ dependencies = [
"libc",
]
-[[package]]
-name = "hex"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
[[package]]
name = "iana-time-zone"
-version = "0.1.41"
+version = "0.1.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1779539f58004e5dba1c1f093d44325ebeb244bfc04b791acdc0aaeca9c04570"
+checksum = "237a0714f28b1ee39ccec0770ccb544eb02c9ef2c82bb096230eefcffa6468b0"
dependencies = [
"android_system_properties",
- "core-foundation",
+ "core-foundation-sys",
"js-sys",
+ "once_cell",
"wasm-bindgen",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "idna"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
+ "winapi",
]
[[package]]
@@ -1010,26 +332,6 @@ dependencies = [
"hashbrown",
]
-[[package]]
-name = "inotify"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f"
-dependencies = [
- "bitflags",
- "inotify-sys",
- "libc",
-]
-
-[[package]]
-name = "inotify-sys"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "insta"
version = "1.19.1"
@@ -1044,29 +346,11 @@ dependencies = [
"yaml-rust",
]
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "itertools"
-version = "0.10.3"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
dependencies = [
"either",
]
@@ -1079,32 +363,13 @@ checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
[[package]]
name = "js-sys"
-version = "0.3.59"
+version = "0.3.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2"
+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
dependencies = [
"wasm-bindgen",
]
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "kv-log-macro"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
-dependencies = [
- "log",
-]
-
[[package]]
name = "lalrpop"
version = "0.19.8"
@@ -1143,12 +408,6 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
[[package]]
name = "libc"
version = "0.2.127"
@@ -1163,9 +422,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "lock_api"
-version = "0.4.7"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
dependencies = [
"autocfg",
"scopeguard",
@@ -1177,40 +436,24 @@ version = "0.4.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
dependencies = [
- "cfg-if 1.0.0",
- "value-bag",
+ "cfg-if",
]
[[package]]
name = "lz4_flex"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c038063f7a78126c539d666a0323a2032de5e7366012cd14a6eafc5ba290bbd6"
+checksum = "1a8cbbb2831780bc3b9c15a41f5b49222ef756b6730a95f3decfdd15903eb5a3"
dependencies = [
"twox-hash",
]
-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
[[package]]
name = "memchr"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-[[package]]
-name = "memmap2"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a79b39c93a7a5a27eeaf9a23b5ff43f1b9e0ad6b1cdd441140ae53c35613fc7"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "memoffset"
version = "0.6.5"
@@ -1220,114 +463,12 @@ dependencies = [
"autocfg",
]
-[[package]]
-name = "miniz_oxide"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "mio"
-version = "0.6.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
-dependencies = [
- "cfg-if 0.1.10",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
- "libc",
- "log",
- "miow",
- "net2",
- "slab",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "mio-extras"
-version = "2.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
-dependencies = [
- "lazycell",
- "log",
- "mio",
- "slab",
-]
-
-[[package]]
-name = "miow"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
-dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
-]
-
-[[package]]
-name = "net2"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "winapi 0.3.9",
-]
-
[[package]]
name = "new_debug_unreachable"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
-[[package]]
-name = "nix"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc"
-dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
- "libc",
-]
-
-[[package]]
-name = "nom"
-version = "5.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
-dependencies = [
- "memchr",
- "version_check",
-]
-
-[[package]]
-name = "notify"
-version = "4.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257"
-dependencies = [
- "bitflags",
- "filetime",
- "fsevent",
- "fsevent-sys",
- "inotify",
- "libc",
- "mio",
- "mio-extras",
- "walkdir",
- "winapi 0.3.9",
-]
-
[[package]]
name = "num-bigint"
version = "0.4.3"
@@ -1385,30 +526,6 @@ version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "os_str_bytes"
-version = "6.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4"
-
-[[package]]
-name = "parking"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
-
[[package]]
name = "parking_lot"
version = "0.12.1"
@@ -1425,37 +542,13 @@ version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"libc",
"redox_syscall",
"smallvec",
"windows-sys",
]
-[[package]]
-name = "path-absolutize"
-version = "3.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3de4b40bd9736640f14c438304c09538159802388febb02c8abaae0846c1f13"
-dependencies = [
- "path-dedot",
-]
-
-[[package]]
-name = "path-dedot"
-version = "3.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d611d5291372b3738a34ebf0d1f849e58b1dcc1101032f76a346eaa1f8ddbb5b"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
[[package]]
name = "petgraph"
version = "0.6.2"
@@ -1466,32 +559,13 @@ dependencies = [
"indexmap",
]
-[[package]]
-name = "phf"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
-dependencies = [
- "phf_shared 0.8.0",
-]
-
[[package]]
name = "phf"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
dependencies = [
- "phf_shared 0.10.0",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
-dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
+ "phf_shared",
]
[[package]]
@@ -1500,18 +574,8 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
-dependencies = [
- "phf_shared 0.8.0",
- "rand 0.7.3",
+ "phf_generator",
+ "phf_shared",
]
[[package]]
@@ -1520,17 +584,8 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
dependencies = [
- "phf_shared 0.10.0",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
-dependencies = [
- "siphasher",
+ "phf_shared",
+ "rand",
]
[[package]]
@@ -1548,31 +603,6 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
-[[package]]
-name = "pin-project-lite"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "polling"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "log",
- "wepoll-ffi",
- "winapi 0.3.9",
-]
-
[[package]]
name = "ppv-lite86"
version = "0.2.16"
@@ -1585,30 +615,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
[[package]]
name = "proc-macro2"
version = "1.0.43"
@@ -1627,20 +633,6 @@ dependencies = [
"proc-macro2",
]
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
- "rand_pcg",
-]
-
[[package]]
name = "rand"
version = "0.8.5"
@@ -1648,18 +640,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.3",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
+ "rand_chacha",
+ "rand_core",
]
[[package]]
@@ -1669,43 +651,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
- "rand_core 0.6.3",
+ "rand_core",
]
[[package]]
name = "rand_core"
-version = "0.5.1"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-dependencies = [
- "getrandom 0.2.7",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-dependencies = [
- "rand_core 0.5.1",
+ "getrandom",
]
[[package]]
@@ -1747,7 +702,7 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
- "getrandom 0.2.7",
+ "getrandom",
"redox_syscall",
"thiserror",
]
@@ -1775,72 +730,26 @@ version = "0.6.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin",
- "untrusted",
- "web-sys",
- "winapi 0.3.9",
-]
-
[[package]]
name = "ruff"
version = "0.0.44"
dependencies = [
"anyhow",
- "bincode",
- "cacache",
"chrono",
- "clap",
- "clearscreen",
- "colored",
- "common-path",
- "dirs 4.0.0",
"fern",
"filetime",
"glob",
"insta",
"itertools",
"log",
- "notify",
"once_cell",
- "path-absolutize",
"rayon",
"regex",
"rustpython-parser",
"serde",
"serde_json",
"toml",
- "update-informer",
- "walkdir",
-]
-
-[[package]]
-name = "rustls"
-version = "0.20.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033"
-dependencies = [
- "log",
- "ring",
- "sct",
- "webpki",
+ "wasm-bindgen",
]
[[package]]
@@ -1882,8 +791,8 @@ dependencies = [
"log",
"num-bigint",
"num-traits",
- "phf 0.10.1",
- "phf_codegen 0.10.0",
+ "phf",
+ "phf_codegen",
"rustpython-ast",
"rustpython-compiler-core",
"thiserror",
@@ -1905,37 +814,12 @@ version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
[[package]]
name = "scopeguard"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-[[package]]
-name = "sct"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711"
-
[[package]]
name = "serde"
version = "1.0.143"
@@ -1958,84 +842,15 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.83"
+version = "1.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7"
+checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
dependencies = [
"itoa",
"ryu",
"serde",
]
-[[package]]
-name = "sha-1"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "sha2"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "sha2"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "signal-hook"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "similar"
version = "2.2.0"
@@ -2048,52 +863,12 @@ version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
-[[package]]
-name = "slab"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
-dependencies = [
- "autocfg",
-]
-
[[package]]
name = "smallvec"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
-[[package]]
-name = "socket2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "ssri"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9cec0d388f39fbe79d7aa600e8d38053bf97b1bc8d350da7c0ba800d0f423f2"
-dependencies = [
- "base64 0.10.1",
- "digest 0.8.1",
- "hex 0.3.2",
- "serde",
- "sha-1 0.8.2",
- "sha2 0.8.2",
- "thiserror",
-]
-
[[package]]
name = "static_assertions"
version = "1.1.0"
@@ -2109,41 +884,21 @@ dependencies = [
"new_debug_unreachable",
"once_cell",
"parking_lot",
- "phf_shared 0.10.0",
+ "phf_shared",
"precomputed-hash",
]
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
[[package]]
name = "syn"
-version = "1.0.99"
+version = "1.0.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
+checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
-[[package]]
-name = "tempfile"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
-dependencies = [
- "cfg-if 1.0.0",
- "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi 0.3.9",
-]
-
[[package]]
name = "term"
version = "0.7.0"
@@ -2152,16 +907,7 @@ checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
dependencies = [
"dirs-next",
"rustversion",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
+ "winapi",
]
[[package]]
@@ -2171,42 +917,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
dependencies = [
"libc",
- "winapi 0.3.9",
+ "winapi",
]
-[[package]]
-name = "terminfo"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76971977e6121664ec1b960d1313aacfa75642adc93b9d4d53b247bd4cb1747e"
-dependencies = [
- "dirs 2.0.2",
- "fnv",
- "nom",
- "phf 0.8.0",
- "phf_codegen 0.8.0",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
-
[[package]]
name = "thiserror"
-version = "1.0.32"
+version = "1.0.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994"
+checksum = "c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.32"
+version = "1.0.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21"
+checksum = "f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783"
dependencies = [
"proc-macro2",
"quote",
@@ -2221,7 +948,7 @@ checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
dependencies = [
"libc",
"wasi 0.10.0+wasi-snapshot-preview1",
- "winapi 0.3.9",
+ "winapi",
]
[[package]]
@@ -2233,21 +960,6 @@ dependencies = [
"crunchy",
]
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
[[package]]
name = "toml"
version = "0.5.9"
@@ -2263,16 +975,10 @@ version = "1.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"static_assertions",
]
-[[package]]
-name = "typenum"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
-
[[package]]
name = "unic-char-property"
version = "0.9.0"
@@ -2325,98 +1031,23 @@ dependencies = [
"unic-common",
]
-[[package]]
-name = "unicode-bidi"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
-
[[package]]
name = "unicode-ident"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6"
-dependencies = [
- "tinyvec",
-]
+checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
[[package]]
name = "unicode-xid"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "unicode_names2"
-version = "0.5.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eec8e807a365e5c972debc47b8f06d361b37b94cfd18d48f7adc715fb86404dd"
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "update-informer"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f154aee470c0882ea0f3b1cc2a46c5f4d24f282655f7b0cec065614fe24c447f"
-dependencies = [
- "directories",
- "semver",
- "serde",
- "serde_json",
- "ureq",
-]
-
-[[package]]
-name = "ureq"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f"
-dependencies = [
- "base64 0.13.0",
- "chunked_transfer",
- "flate2",
- "log",
- "once_cell",
- "rustls",
- "serde",
- "serde_json",
- "url",
- "webpki",
- "webpki-roots",
-]
-
-[[package]]
-name = "url"
-version = "2.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
-dependencies = [
- "form_urlencoded",
- "idna",
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "value-bag"
-version = "1.0.0-alpha.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
-dependencies = [
- "ctor",
- "version_check",
-]
+checksum = "029df4cc8238cefc911704ff8fa210853a0f3bce2694d8f51181dd41ee0f3301"
[[package]]
name = "version_check"
@@ -2424,29 +1055,6 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-[[package]]
-name = "waker-fn"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
-
-[[package]]
-name = "walkdir"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
-dependencies = [
- "same-file",
- "winapi 0.3.9",
- "winapi-util",
-]
-
-[[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"
@@ -2461,19 +1069,19 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.82"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.82"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
dependencies = [
"bumpalo",
"log",
@@ -2484,23 +1092,11 @@ dependencies = [
"wasm-bindgen-shared",
]
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.82"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2508,9 +1104,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.82"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
dependencies = [
"proc-macro2",
"quote",
@@ -2521,64 +1117,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.82"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
-
-[[package]]
-name = "web-sys"
-version = "0.3.59"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf"
-dependencies = [
- "webpki",
-]
-
-[[package]]
-name = "wepoll-ffi"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "which"
-version = "4.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae"
-dependencies = [
- "either",
- "lazy_static",
- "libc",
-]
-
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
[[package]]
name = "winapi"
@@ -2590,27 +1131,12 @@ dependencies = [
"winapi-x86_64-pc-windows-gnu",
]
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi 0.3.9",
-]
-
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
@@ -2660,16 +1186,6 @@ version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
[[package]]
name = "yaml-rust"
version = "0.4.5"
diff --git a/Cargo.toml b/Cargo.toml
index d781476184..0f69740796 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,41 +5,28 @@ edition = "2021"
[lib]
name = "ruff"
+crate-type = ["cdylib"]
[dependencies]
+wasm-bindgen = "0.2.83"
anyhow = { version = "1.0.60" }
-bincode = { version = "1.3.3" }
-cacache = { version = "10.0.1" }
chrono = { version = "0.4.21" }
-clap = { version = "3.2.16", features = ["derive"] }
-clearscreen = { version = "1.0.10" }
-colored = { version = "2.0.0" }
-common-path = { version = "1.0.0" }
-dirs = { version = "4.0.0" }
fern = { version = "0.6.1" }
filetime = { version = "0.2.17" }
glob = { version = "0.3.0" }
itertools = { version = "0.10.3" }
log = { version = "0.4.17" }
-notify = { version = "4.0.17" }
once_cell = { version = "1.13.1" }
-path-absolutize = { version = "3.0.13", features = ["once_cell_cache"] }
rayon = { version = "1.5.3" }
regex = { version = "1.6.0" }
rustpython-parser = { features = ["lalrpop"], git = "https://github.com/charliermarsh/RustPython.git", rev = "7d21c6923a506e79cc041708d83cef925efd33f4" }
serde = { version = "1.0.143", features = ["derive"] }
serde_json = { version = "1.0.83" }
toml = { version = "0.5.9" }
-update-informer = { version = "0.5.0", default_features = false, features = ["pypi"], optional = true }
-walkdir = { version = "2.3.2" }
[dev-dependencies]
insta = { version = "1.19.1", features = ["yaml"] }
-[features]
-default = ["update-informer"]
-update-informer = ["dep:update-informer"]
-
[profile.release]
panic = "abort"
lto = "thin"
diff --git a/demo/.gitignore b/demo/.gitignore
new file mode 100644
index 0000000000..a547bf36d8
--- /dev/null
+++ b/demo/.gitignore
@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/demo/.prettierignore b/demo/.prettierignore
new file mode 100644
index 0000000000..de4d1f007d
--- /dev/null
+++ b/demo/.prettierignore
@@ -0,0 +1,2 @@
+dist
+node_modules
diff --git a/demo/index.css b/demo/index.css
new file mode 100644
index 0000000000..9ce75d817f
--- /dev/null
+++ b/demo/index.css
@@ -0,0 +1,7 @@
+body,
+html,
+#root {
+ margin: 0;
+ width: 100%;
+ height: 100%;
+}
diff --git a/demo/index.html b/demo/index.html
new file mode 100644
index 0000000000..cc4767e7f4
--- /dev/null
+++ b/demo/index.html
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+ Ruff Playground
+
+
+
+
+
+
+
- , contents: &str) -> String {
- let lines: Vec<&str> = contents.lines().collect();
-
- let mut output = "".to_string();
- let mut last_pos: Location = Location::new(0, 0);
-
- for fix in fixes {
- // Best-effort approach: if this fix overlaps with a fix we've already applied, skip it.
- if last_pos > fix.start {
- continue;
- }
-
- if fix.start.row() > last_pos.row() {
- if last_pos.row() > 0 || last_pos.column() > 0 {
- output.push_str(&lines[last_pos.row() - 1][last_pos.column() - 1..]);
- output.push('\n');
- }
- for line in &lines[last_pos.row()..fix.start.row() - 1] {
- output.push_str(line);
- output.push('\n');
- }
- output.push_str(&lines[fix.start.row() - 1][..fix.start.column() - 1]);
- output.push_str(&fix.content);
- } else {
- output.push_str(
- &lines[last_pos.row() - 1][last_pos.column() - 1..fix.start.column() - 1],
- );
- output.push_str(&fix.content);
- }
-
- last_pos = fix.end;
- fix.applied = true;
- }
-
- if last_pos.row() > 0 || last_pos.column() > 0 {
- output.push_str(&lines[last_pos.row() - 1][last_pos.column() - 1..]);
- output.push('\n');
- }
- for line in &lines[last_pos.row()..] {
- output.push_str(line);
- output.push('\n');
- }
-
- output
-}
-
-#[cfg(test)]
-mod tests {
- use anyhow::Result;
- use rustpython_parser::ast::Location;
-
- use crate::autofix::fixer::apply_fixes;
- use crate::checks::Fix;
-
- #[test]
- fn empty_file() -> Result<()> {
- let mut fixes = vec![];
- let actual = apply_fixes(fixes.iter_mut(), "");
- let expected = "";
-
- assert_eq!(actual, expected);
-
- Ok(())
- }
-
- #[test]
- fn apply_single_replacement() -> Result<()> {
- let mut fixes = vec![Fix {
- content: "Bar".to_string(),
- start: Location::new(1, 9),
- end: Location::new(1, 15),
- applied: false,
- }];
- let actual = apply_fixes(
- fixes.iter_mut(),
- "class A(object):
- ...
-",
- );
-
- let expected = "class A(Bar):
- ...
-";
-
- assert_eq!(actual, expected);
-
- Ok(())
- }
-
- #[test]
- fn apply_single_removal() -> Result<()> {
- let mut fixes = vec![Fix {
- content: "".to_string(),
- start: Location::new(1, 8),
- end: Location::new(1, 16),
- applied: false,
- }];
- let actual = apply_fixes(
- fixes.iter_mut(),
- "class A(object):
- ...
-",
- );
-
- let expected = "class A:
- ...
-";
-
- assert_eq!(actual, expected);
-
- Ok(())
- }
-
- #[test]
- fn apply_double_removal() -> Result<()> {
- let mut fixes = vec![
- Fix {
- content: "".to_string(),
- start: Location::new(1, 8),
- end: Location::new(1, 17),
- applied: false,
- },
- Fix {
- content: "".to_string(),
- start: Location::new(1, 17),
- end: Location::new(1, 24),
- applied: false,
- },
- ];
- let actual = apply_fixes(
- fixes.iter_mut(),
- "class A(object, object):
- ...
-",
- );
-
- let expected = "class A:
- ...
-";
-
- assert_eq!(actual, expected);
-
- Ok(())
- }
-
- #[test]
- fn ignore_overlapping_fixes() -> Result<()> {
- let mut fixes = vec![
- Fix {
- content: "".to_string(),
- start: Location::new(1, 8),
- end: Location::new(1, 16),
- applied: false,
- },
- Fix {
- content: "ignored".to_string(),
- start: Location::new(1, 10),
- end: Location::new(1, 12),
- applied: false,
- },
- ];
- let actual = apply_fixes(
- fixes.iter_mut(),
- "class A(object):
- ...
-",
- );
-
- let expected = "class A:
- ...
-";
-
- assert_eq!(actual, expected);
-
- Ok(())
- }
-}
diff --git a/src/cache.rs b/src/cache.rs
deleted file mode 100644
index f53a37ff68..0000000000
--- a/src/cache.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-use std::collections::hash_map::DefaultHasher;
-use std::fs::{create_dir_all, File, Metadata};
-use std::hash::{Hash, Hasher};
-use std::io::Write;
-use std::path::Path;
-
-use anyhow::Result;
-use cacache::Error::EntryNotFound;
-use filetime::FileTime;
-use log::error;
-use path_absolutize::Absolutize;
-use serde::{Deserialize, Serialize};
-
-use crate::autofix::fixer;
-use crate::message::Message;
-use crate::settings::Settings;
-
-const VERSION: &str = env!("CARGO_PKG_VERSION");
-
-#[derive(Serialize, Deserialize)]
-struct CacheMetadata {
- mtime: i64,
-}
-
-#[derive(Serialize)]
-struct CheckResultRef<'a> {
- metadata: &'a CacheMetadata,
- messages: &'a [Message],
-}
-
-#[derive(Deserialize)]
-struct CheckResult {
- metadata: CacheMetadata,
- messages: Vec,
-}
-
-pub enum Mode {
- ReadWrite,
- ReadOnly,
- WriteOnly,
- None,
-}
-
-impl Mode {
- fn allow_read(&self) -> bool {
- match self {
- Mode::ReadWrite => true,
- Mode::ReadOnly => true,
- Mode::WriteOnly => false,
- Mode::None => false,
- }
- }
-
- fn allow_write(&self) -> bool {
- match self {
- Mode::ReadWrite => true,
- Mode::ReadOnly => false,
- Mode::WriteOnly => true,
- Mode::None => false,
- }
- }
-}
-
-impl From for Mode {
- fn from(value: bool) -> Self {
- match value {
- true => Mode::ReadWrite,
- false => Mode::None,
- }
- }
-}
-
-fn cache_dir() -> &'static str {
- "./.ruff_cache"
-}
-
-fn cache_key(path: &Path, settings: &Settings, autofix: &fixer::Mode) -> String {
- let mut hasher = DefaultHasher::new();
- settings.hash(&mut hasher);
- autofix.hash(&mut hasher);
- format!(
- "{}@{}@{}",
- path.absolutize().unwrap().to_string_lossy(),
- VERSION,
- hasher.finish()
- )
-}
-
-pub fn init() -> Result<()> {
- let gitignore_path = Path::new(cache_dir()).join(".gitignore");
- if gitignore_path.exists() {
- return Ok(());
- }
- create_dir_all(cache_dir())?;
- let mut file = File::create(gitignore_path)?;
- file.write_all(b"*").map_err(|e| e.into())
-}
-
-pub fn get(
- path: &Path,
- metadata: &Metadata,
- settings: &Settings,
- autofix: &fixer::Mode,
- mode: &Mode,
-) -> Option> {
- if !mode.allow_read() {
- return None;
- };
-
- match cacache::read_sync(cache_dir(), cache_key(path, settings, autofix)) {
- Ok(encoded) => match bincode::deserialize::(&encoded[..]) {
- Ok(CheckResult {
- metadata: CacheMetadata { mtime },
- messages,
- }) => {
- if FileTime::from_last_modification_time(metadata).unix_seconds() == mtime {
- return Some(messages);
- }
- }
- Err(e) => error!("Failed to deserialize encoded cache entry: {e:?}"),
- },
- Err(EntryNotFound(_, _)) => {}
- Err(e) => error!("Failed to read from cache: {e:?}"),
- }
- None
-}
-
-pub fn set(
- path: &Path,
- metadata: &Metadata,
- settings: &Settings,
- autofix: &fixer::Mode,
- messages: &[Message],
- mode: &Mode,
-) {
- if !mode.allow_write() {
- return;
- };
-
- let check_result = CheckResultRef {
- metadata: &CacheMetadata {
- mtime: FileTime::from_last_modification_time(metadata).unix_seconds(),
- },
- messages,
- };
- if let Err(e) = cacache::write_sync(
- cache_dir(),
- cache_key(path, settings, autofix),
- bincode::serialize(&check_result).unwrap(),
- ) {
- error!("Failed to write to cache: {e:?}")
- }
-}
diff --git a/src/fs.rs b/src/fs.rs
deleted file mode 100644
index a48b3dc926..0000000000
--- a/src/fs.rs
+++ /dev/null
@@ -1,243 +0,0 @@
-use std::borrow::Cow;
-use std::fs::File;
-use std::io::{BufReader, Read};
-use std::ops::Deref;
-use std::path::{Path, PathBuf};
-
-use anyhow::{anyhow, Result};
-use log::debug;
-use path_absolutize::path_dedot;
-use path_absolutize::Absolutize;
-use walkdir::{DirEntry, WalkDir};
-
-use crate::settings::FilePattern;
-
-/// Extract the absolute path and basename (as strings) from a Path.
-fn extract_path_names(path: &Path) -> Result<(&str, &str)> {
- let file_path = path
- .to_str()
- .ok_or_else(|| anyhow!("Unable to parse filename: {:?}", path))?;
- let file_basename = path
- .file_name()
- .ok_or_else(|| anyhow!("Unable to parse filename: {:?}", path))?
- .to_str()
- .ok_or_else(|| anyhow!("Unable to parse filename: {:?}", path))?;
- Ok((file_path, file_basename))
-}
-
-fn is_excluded(file_path: &str, file_basename: &str, exclude: &[FilePattern]) -> bool {
- for pattern in exclude {
- match &pattern {
- FilePattern::Simple(basename) => {
- if *basename == file_basename {
- return true;
- }
- }
- FilePattern::Complex(absolute, basename) => {
- if absolute.matches(file_path) {
- return true;
- }
- if basename
- .as_ref()
- .map(|pattern| pattern.matches(file_basename))
- .unwrap_or_default()
- {
- return true;
- }
- }
- }
- }
- false
-}
-
-fn is_included(path: &Path) -> bool {
- let file_name = path.to_string_lossy();
- file_name.ends_with(".py") || file_name.ends_with(".pyi")
-}
-
-pub fn iter_python_files<'a>(
- path: &'a Path,
- exclude: &'a [FilePattern],
- extend_exclude: &'a [FilePattern],
-) -> impl Iterator
- > + 'a {
- // Run some checks over the provided patterns, to enable optimizations below.
- let has_exclude = !exclude.is_empty();
- let has_extend_exclude = !extend_exclude.is_empty();
- let exclude_simple = exclude
- .iter()
- .all(|pattern| matches!(pattern, FilePattern::Simple(_)));
- let extend_exclude_simple = extend_exclude
- .iter()
- .all(|pattern| matches!(pattern, FilePattern::Simple(_)));
-
- WalkDir::new(normalize_path(path))
- .follow_links(true)
- .into_iter()
- .filter_entry(move |entry| {
- if !has_exclude && !has_extend_exclude {
- return true;
- }
-
- let path = entry.path();
- match extract_path_names(path) {
- Ok((file_path, file_basename)) => {
- let file_type = entry.file_type();
-
- if has_exclude
- && (!exclude_simple || file_type.is_dir())
- && is_excluded(file_path, file_basename, exclude)
- {
- debug!("Ignored path via `exclude`: {:?}", path);
- false
- } else if has_extend_exclude
- && (!extend_exclude_simple || file_type.is_dir())
- && is_excluded(file_path, file_basename, extend_exclude)
- {
- debug!("Ignored path via `extend-exclude`: {:?}", path);
- false
- } else {
- true
- }
- }
- Err(_) => {
- debug!("Ignored path due to error in parsing: {:?}", path);
- true
- }
- }
- })
- .filter(|entry| {
- entry.as_ref().map_or(true, |entry| {
- (entry.depth() == 0 && !entry.file_type().is_dir()) || is_included(entry.path())
- })
- })
-}
-
-/// Convert any path to an absolute path (based on the current working directory).
-pub fn normalize_path(path: &Path) -> PathBuf {
- if let Ok(path) = path.absolutize() {
- return path.to_path_buf();
- }
- path.to_path_buf()
-}
-
-/// Convert any path to an absolute path (based on the specified project root).
-pub fn normalize_path_to(path: &Path, project_root: &Path) -> PathBuf {
- if let Ok(path) = path.absolutize_from(project_root) {
- return path.to_path_buf();
- }
- path.to_path_buf()
-}
-
-/// Convert an absolute path to be relative to the current working directory.
-pub fn relativize_path(path: &Path) -> Cow {
- if let Ok(path) = path.strip_prefix(path_dedot::CWD.deref()) {
- return path.to_string_lossy();
- }
- path.to_string_lossy()
-}
-
-/// Read a file's contents from disk.
-pub fn read_file(path: &Path) -> Result {
- let file = File::open(path)?;
- let mut buf_reader = BufReader::new(file);
- let mut contents = String::new();
- buf_reader.read_to_string(&mut contents)?;
- Ok(contents)
-}
-
-#[cfg(test)]
-mod tests {
- use std::path::Path;
-
- use anyhow::Result;
- use path_absolutize::Absolutize;
-
- use crate::fs::{extract_path_names, is_excluded, is_included};
- use crate::settings::FilePattern;
-
- #[test]
- fn inclusions() {
- let path = Path::new("foo/bar/baz.py").absolutize().unwrap();
- assert!(is_included(&path));
-
- let path = Path::new("foo/bar/baz.pyi").absolutize().unwrap();
- assert!(is_included(&path));
-
- let path = Path::new("foo/bar/baz.js").absolutize().unwrap();
- assert!(!is_included(&path));
-
- let path = Path::new("foo/bar/baz").absolutize().unwrap();
- assert!(!is_included(&path));
- }
-
- #[test]
- fn exclusions() -> Result<()> {
- let project_root = Path::new("/tmp/");
-
- let path = Path::new("foo").absolutize_from(project_root).unwrap();
- let exclude = vec![FilePattern::from_user(
- "foo",
- &Some(project_root.to_path_buf()),
- )];
- let (file_path, file_basename) = extract_path_names(&path)?;
- assert!(is_excluded(file_path, file_basename, &exclude));
-
- let path = Path::new("foo/bar").absolutize_from(project_root).unwrap();
- let exclude = vec![FilePattern::from_user(
- "bar",
- &Some(project_root.to_path_buf()),
- )];
- let (file_path, file_basename) = extract_path_names(&path)?;
- assert!(is_excluded(file_path, file_basename, &exclude));
-
- let path = Path::new("foo/bar/baz.py")
- .absolutize_from(project_root)
- .unwrap();
- let exclude = vec![FilePattern::from_user(
- "baz.py",
- &Some(project_root.to_path_buf()),
- )];
- let (file_path, file_basename) = extract_path_names(&path)?;
- assert!(is_excluded(file_path, file_basename, &exclude));
-
- let path = Path::new("foo/bar").absolutize_from(project_root).unwrap();
- let exclude = vec![FilePattern::from_user(
- "foo/bar",
- &Some(project_root.to_path_buf()),
- )];
- let (file_path, file_basename) = extract_path_names(&path)?;
- assert!(is_excluded(file_path, file_basename, &exclude));
-
- let path = Path::new("foo/bar/baz.py")
- .absolutize_from(project_root)
- .unwrap();
- let exclude = vec![FilePattern::from_user(
- "foo/bar/baz.py",
- &Some(project_root.to_path_buf()),
- )];
- let (file_path, file_basename) = extract_path_names(&path)?;
- assert!(is_excluded(file_path, file_basename, &exclude));
-
- let path = Path::new("foo/bar/baz.py")
- .absolutize_from(project_root)
- .unwrap();
- let exclude = vec![FilePattern::from_user(
- "foo/bar/*.py",
- &Some(project_root.to_path_buf()),
- )];
- let (file_path, file_basename) = extract_path_names(&path)?;
- assert!(is_excluded(file_path, file_basename, &exclude));
-
- let path = Path::new("foo/bar/baz.py")
- .absolutize_from(project_root)
- .unwrap();
- let exclude = vec![FilePattern::from_user(
- "baz",
- &Some(project_root.to_path_buf()),
- )];
- let (file_path, file_basename) = extract_path_names(&path)?;
- assert!(!is_excluded(file_path, file_basename, &exclude));
-
- Ok(())
- }
-}
diff --git a/src/lib.rs b/src/lib.rs
index 22b5466d00..ba7d7ca5ff 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,16 +1,73 @@
-extern crate core;
+use rustpython_parser::ast::Location;
+use std::path::Path;
+
+use rustpython_parser::parser;
+use wasm_bindgen::prelude::*;
+
+use crate::check_ast::check_ast;
+use crate::check_lines::check_lines;
+use crate::checks::{Check, CheckCode, CheckKind, ALL_CHECK_CODES};
+use crate::settings::Settings;
mod ast;
mod autofix;
-pub mod cache;
pub mod check_ast;
mod check_lines;
pub mod checks;
-pub mod fs;
-pub mod linter;
-pub mod logging;
-pub mod message;
-pub mod printer;
-pub mod pyproject;
mod python;
pub mod settings;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+struct Message {
+ code: CheckCode,
+ message: String,
+ location: Location,
+}
+
+#[wasm_bindgen]
+extern "C" {
+ pub fn alert(s: &str);
+}
+
+#[wasm_bindgen]
+pub fn check(contents: &str) -> String {
+ let settings = Settings::for_rules(ALL_CHECK_CODES.to_vec());
+ let autofix = autofix::fixer::Mode::None;
+
+ // Aggregate all checks.
+ let mut checks: Vec = vec![];
+
+ // Run the AST-based checks.
+ match parser::parse_program(contents, "") {
+ Ok(python_ast) => checks.extend(check_ast(
+ &python_ast,
+ contents,
+ &settings,
+ &autofix,
+ Path::new(""),
+ )),
+ Err(parse_error) => {
+ if settings.select.contains(&CheckCode::E999) {
+ checks.push(Check::new(
+ CheckKind::SyntaxError(parse_error.error.to_string()),
+ parse_error.location,
+ ))
+ }
+ }
+ }
+
+ // Run the lines-based checks.
+ check_lines(&mut checks, contents, &settings);
+
+ let messages: Vec = checks
+ .into_iter()
+ .map(|check| Message {
+ code: check.kind.code().clone(),
+ message: check.kind.body(),
+ location: check.location,
+ })
+ .collect();
+
+ serde_json::to_string(&messages).unwrap()
+}
diff --git a/src/linter.rs b/src/linter.rs
deleted file mode 100644
index 5b51a5bd6a..0000000000
--- a/src/linter.rs
+++ /dev/null
@@ -1,628 +0,0 @@
-use std::path::Path;
-
-use anyhow::Result;
-use log::debug;
-use rustpython_parser::parser;
-
-use crate::autofix::fixer;
-use crate::autofix::fixer::fix_file;
-use crate::check_ast::check_ast;
-use crate::check_lines::check_lines;
-use crate::checks::{Check, CheckCode, CheckKind, LintSource};
-use crate::message::Message;
-use crate::settings::Settings;
-use crate::{cache, fs};
-
-fn check_path(
- path: &Path,
- contents: &str,
- settings: &Settings,
- autofix: &fixer::Mode,
-) -> Vec {
- // Aggregate all checks.
- let mut checks: Vec = vec![];
-
- // Run the AST-based checks.
- if settings
- .select
- .iter()
- .any(|check_code| matches!(check_code.lint_source(), LintSource::AST))
- {
- match parser::parse_program(contents, "") {
- Ok(python_ast) => {
- checks.extend(check_ast(&python_ast, contents, settings, autofix, path))
- }
- Err(parse_error) => {
- if settings.select.contains(&CheckCode::E999) {
- checks.push(Check::new(
- CheckKind::SyntaxError(parse_error.error.to_string()),
- parse_error.location,
- ))
- }
- }
- }
- }
-
- // Run the lines-based checks.
- check_lines(&mut checks, contents, settings);
-
- checks
-}
-
-pub fn lint_path(
- path: &Path,
- settings: &Settings,
- mode: &cache::Mode,
- autofix: &fixer::Mode,
-) -> Result> {
- let metadata = path.metadata()?;
-
- // Check the cache.
- if let Some(messages) = cache::get(path, &metadata, settings, autofix, mode) {
- debug!("Cache hit for: {}", path.to_string_lossy());
- return Ok(messages);
- }
-
- // Read the file from disk.
- let contents = fs::read_file(path)?;
-
- // Generate checks.
- let mut checks = check_path(path, &contents, settings, autofix);
-
- // Apply autofix.
- if matches!(autofix, fixer::Mode::Apply) {
- fix_file(&mut checks, &contents, path)?;
- };
-
- // Convert to messages.
- let messages: Vec = checks
- .into_iter()
- .map(|check| Message {
- kind: check.kind,
- fixed: check.fix.map(|fix| fix.applied).unwrap_or_default(),
- location: check.location,
- filename: path.to_string_lossy().to_string(),
- })
- .collect();
- cache::set(path, &metadata, settings, autofix, &messages, mode);
-
- Ok(messages)
-}
-
-#[cfg(test)]
-mod tests {
- use std::path::Path;
-
- use anyhow::Result;
-
- use crate::autofix::fixer;
- use crate::checks::{Check, CheckCode};
- use crate::fs;
- use crate::linter;
- use crate::settings;
-
- fn check_path(
- path: &Path,
- settings: &settings::Settings,
- autofix: &fixer::Mode,
- ) -> Result> {
- let contents = fs::read_file(path)?;
- Ok(linter::check_path(path, &contents, settings, autofix))
- }
-
- #[test]
- fn e402() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/E402.py"),
- &settings::Settings::for_rule(CheckCode::E402),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn e501() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/E501.py"),
- &settings::Settings::for_rule(CheckCode::E501),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn e711() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/E711.py"),
- &settings::Settings::for_rule(CheckCode::E711),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn e712() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/E712.py"),
- &settings::Settings::for_rule(CheckCode::E712),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn e713() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/E713.py"),
- &settings::Settings::for_rule(CheckCode::E713),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn e721() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/E721.py"),
- &settings::Settings::for_rule(CheckCode::E721),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn e722() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/E722.py"),
- &settings::Settings::for_rule(CheckCode::E722),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn e714() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/E714.py"),
- &settings::Settings::for_rule(CheckCode::E714),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn e731() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/E731.py"),
- &settings::Settings::for_rule(CheckCode::E731),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn e741() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/E741.py"),
- &settings::Settings::for_rule(CheckCode::E741),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn e742() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/E742.py"),
- &settings::Settings::for_rule(CheckCode::E742),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn e743() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/E743.py"),
- &settings::Settings::for_rule(CheckCode::E743),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f401() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F401.py"),
- &settings::Settings::for_rule(CheckCode::F401),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f402() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F402.py"),
- &settings::Settings::for_rule(CheckCode::F402),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f403() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F403.py"),
- &settings::Settings::for_rule(CheckCode::F403),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f404() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F404.py"),
- &settings::Settings::for_rule(CheckCode::F404),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f405() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F405.py"),
- &settings::Settings::for_rule(CheckCode::F405),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f406() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F406.py"),
- &settings::Settings::for_rule(CheckCode::F406),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f407() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F407.py"),
- &settings::Settings::for_rule(CheckCode::F407),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f541() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F541.py"),
- &settings::Settings::for_rule(CheckCode::F541),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f601() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F601.py"),
- &settings::Settings::for_rule(CheckCode::F601),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f602() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F602.py"),
- &settings::Settings::for_rule(CheckCode::F602),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f622() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F622.py"),
- &settings::Settings::for_rule(CheckCode::F622),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f631() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F631.py"),
- &settings::Settings::for_rule(CheckCode::F631),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f632() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F632.py"),
- &settings::Settings::for_rule(CheckCode::F632),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f633() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F633.py"),
- &settings::Settings::for_rule(CheckCode::F633),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f634() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F634.py"),
- &settings::Settings::for_rule(CheckCode::F634),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f701() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F701.py"),
- &settings::Settings::for_rule(CheckCode::F701),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f702() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F702.py"),
- &settings::Settings::for_rule(CheckCode::F702),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f704() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F704.py"),
- &settings::Settings::for_rule(CheckCode::F704),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f706() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F706.py"),
- &settings::Settings::for_rule(CheckCode::F706),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f707() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F707.py"),
- &settings::Settings::for_rule(CheckCode::F707),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f722() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F722.py"),
- &settings::Settings::for_rule(CheckCode::F722),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f821() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F821.py"),
- &settings::Settings::for_rule(CheckCode::F821),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f822() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F822.py"),
- &settings::Settings::for_rule(CheckCode::F822),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f823() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F823.py"),
- &settings::Settings::for_rule(CheckCode::F823),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f831() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F831.py"),
- &settings::Settings::for_rule(CheckCode::F831),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f841() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F841.py"),
- &settings::Settings::for_rule(CheckCode::F841),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn f901() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/F901.py"),
- &settings::Settings::for_rule(CheckCode::F901),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn r001() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/R001.py"),
- &settings::Settings::for_rule(CheckCode::R001),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn r002() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/R002.py"),
- &settings::Settings::for_rule(CheckCode::R002),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn init() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/__init__.py"),
- &settings::Settings::for_rules(vec![CheckCode::F821, CheckCode::F822]),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-
- #[test]
- fn future_annotations() -> Result<()> {
- let mut checks = check_path(
- Path::new("./resources/test/fixtures/future_annotations.py"),
- &settings::Settings::for_rules(vec![CheckCode::F401, CheckCode::F821]),
- &fixer::Mode::Generate,
- )?;
- checks.sort_by_key(|check| check.location);
- insta::assert_yaml_snapshot!(checks);
- Ok(())
- }
-}
diff --git a/src/logging.rs b/src/logging.rs
deleted file mode 100644
index 15d3183d7e..0000000000
--- a/src/logging.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use anyhow::Result;
-use fern;
-
-#[macro_export]
-macro_rules! tell_user {
- ($($arg:tt)*) => {
- println!(
- "[{}] {}",
- chrono::Local::now()
- .format("%H:%M:%S %p")
- .to_string()
- .dimmed(),
- format_args!($($arg)*)
- )
- }
-}
-
-pub fn set_up_logging(verbose: bool) -> Result<()> {
- fern::Dispatch::new()
- .format(|out, message, record| {
- out.finish(format_args!(
- "{}[{}][{}] {}",
- chrono::Local::now().format("[%Y-%m-%d][%H:%M:%S]"),
- record.target(),
- record.level(),
- message
- ))
- })
- .level(if verbose {
- log::LevelFilter::Debug
- } else {
- log::LevelFilter::Info
- })
- .chain(std::io::stdout())
- .apply()
- .map_err(|e| e.into())
-}
diff --git a/src/main.rs b/src/main.rs
deleted file mode 100644
index d420305a8d..0000000000
--- a/src/main.rs
+++ /dev/null
@@ -1,304 +0,0 @@
-extern crate core;
-
-use std::io;
-use std::path::{Path, PathBuf};
-use std::process::ExitCode;
-use std::sync::mpsc::channel;
-use std::time::Instant;
-
-use anyhow::Result;
-use clap::{Parser, ValueHint};
-use colored::Colorize;
-use log::{debug, error};
-use notify::{raw_watcher, RecursiveMode, Watcher};
-use rayon::prelude::*;
-use walkdir::DirEntry;
-
-use ::ruff::cache;
-use ::ruff::checks::CheckCode;
-use ::ruff::checks::CheckKind;
-use ::ruff::fs::iter_python_files;
-use ::ruff::linter::lint_path;
-use ::ruff::logging::set_up_logging;
-use ::ruff::message::Message;
-use ::ruff::printer::{Printer, SerializationFormat};
-use ::ruff::pyproject;
-use ::ruff::settings::{FilePattern, Settings};
-use ::ruff::tell_user;
-
-const CARGO_PKG_NAME: &str = env!("CARGO_PKG_NAME");
-const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
-
-#[derive(Debug, Parser)]
-#[clap(name = format!("{CARGO_PKG_NAME} (v{CARGO_PKG_VERSION})"))]
-#[clap(about = "An extremely fast Python linter.", long_about = None)]
-#[clap(version)]
-struct Cli {
- #[clap(parse(from_os_str), value_hint = ValueHint::AnyPath, required = true)]
- files: Vec,
- /// Enable verbose logging.
- #[clap(short, long, action)]
- verbose: bool,
- /// Disable all logging (but still exit with status code "1" upon detecting errors).
- #[clap(short, long, action)]
- quiet: bool,
- /// Exit with status code "0", even upon detecting errors.
- #[clap(short, long, action)]
- exit_zero: bool,
- /// Run in watch mode by re-running whenever files change.
- #[clap(short, long, action)]
- watch: bool,
- /// Attempt to automatically fix lint errors.
- #[clap(short, long, action)]
- fix: bool,
- /// Disable cache reads.
- #[clap(short, long, action)]
- no_cache: bool,
- /// List of error codes to enable.
- #[clap(long, multiple = true)]
- select: Vec,
- /// List of error codes to ignore.
- #[clap(long, multiple = true)]
- ignore: Vec,
- /// List of paths, used to exclude files and/or directories from checks.
- #[clap(long, multiple = true)]
- exclude: Vec,
- /// Like --exclude, but adds additional files and directories on top of the excluded ones.
- #[clap(long, multiple = true)]
- extend_exclude: Vec,
- /// Output serialization format for error messages.
- #[clap(long, arg_enum, default_value_t=SerializationFormat::Text)]
- format: SerializationFormat,
- /// See the files ruff will be run against with the current settings.
- #[clap(long, action)]
- show_files: bool,
- /// See ruff's settings.
- #[clap(long, action)]
- show_settings: bool,
-}
-
-#[cfg(feature = "update-informer")]
-fn check_for_updates() {
- use update_informer::{registry, Check};
-
- let informer = update_informer::new(registry::PyPI, CARGO_PKG_NAME, CARGO_PKG_VERSION);
-
- if let Some(new_version) = informer.check_version().ok().flatten() {
- let msg = format!(
- "A new version of {pkg_name} is available: v{pkg_version} -> {new_version}",
- pkg_name = CARGO_PKG_NAME.italic().cyan(),
- pkg_version = CARGO_PKG_VERSION,
- new_version = new_version.to_string().green()
- );
-
- let cmd = format!(
- "Run to update: {cmd} {pkg_name}",
- cmd = "pip3 install --upgrade".green(),
- pkg_name = CARGO_PKG_NAME.green()
- );
-
- println!("\n{msg}\n{cmd}");
- }
-}
-
-fn show_settings(settings: &Settings) {
- println!("{:#?}", settings);
-}
-
-fn show_files(files: &[PathBuf], settings: &Settings) {
- let mut entries: Vec = files
- .iter()
- .flat_map(|path| iter_python_files(path, &settings.exclude, &settings.extend_exclude))
- .flatten()
- .collect();
- entries.sort_by(|a, b| a.path().cmp(b.path()));
- for entry in entries {
- println!("{}", entry.path().to_string_lossy());
- }
-}
-
-fn run_once(
- files: &[PathBuf],
- settings: &Settings,
- cache: bool,
- autofix: bool,
-) -> Result> {
- // Collect all the files to check.
- let start = Instant::now();
- let paths: Vec> = files
- .iter()
- .flat_map(|path| iter_python_files(path, &settings.exclude, &settings.extend_exclude))
- .collect();
- let duration = start.elapsed();
- debug!("Identified files to lint in: {:?}", duration);
-
- let start = Instant::now();
- let mut messages: Vec = paths
- .par_iter()
- .map(|entry| {
- match entry {
- Ok(entry) => {
- let path = entry.path();
- lint_path(path, settings, &cache.into(), &autofix.into())
- .map_err(|e| (Some(path.to_owned()), e.to_string()))
- }
- Err(e) => Err((
- e.path().map(Path::to_owned),
- e.io_error()
- .map_or_else(|| e.to_string(), io::Error::to_string),
- )),
- }
- .unwrap_or_else(|(path, message)| {
- if let Some(path) = path {
- if settings.select.contains(&CheckCode::E902) {
- vec![Message {
- kind: CheckKind::IOError(message),
- fixed: false,
- location: Default::default(),
- filename: path.to_string_lossy().to_string(),
- }]
- } else {
- error!("Failed to check {}: {message}", path.to_string_lossy());
- vec![]
- }
- } else {
- error!("{message}");
- vec![]
- }
- })
- })
- .flatten()
- .collect();
-
- messages.sort_unstable();
- let duration = start.elapsed();
- debug!("Checked files in: {:?}", duration);
-
- Ok(messages)
-}
-
-fn inner_main() -> Result {
- let cli = Cli::parse();
-
- set_up_logging(cli.verbose)?;
-
- // Find the project root and pyproject.toml.
- let project_root = pyproject::find_project_root(&cli.files);
- match &project_root {
- Some(path) => debug!("Found project root at: {:?}", path),
- None => debug!("Unable to identify project root; assuming current directory..."),
- };
- let pyproject = pyproject::find_pyproject_toml(&project_root);
- match &pyproject {
- Some(path) => debug!("Found pyproject.toml at: {:?}", path),
- None => debug!("Unable to find pyproject.toml; using default settings..."),
- };
-
- // Parse the settings from the pyproject.toml and command-line arguments.
- let exclude: Vec = cli
- .exclude
- .iter()
- .map(|path| FilePattern::from_user(path, &project_root))
- .collect();
- let extend_exclude: Vec = cli
- .extend_exclude
- .iter()
- .map(|path| FilePattern::from_user(path, &project_root))
- .collect();
-
- let mut settings = Settings::from_pyproject(pyproject, project_root);
- if !exclude.is_empty() {
- settings.exclude = exclude;
- }
- if !extend_exclude.is_empty() {
- settings.extend_exclude = extend_exclude;
- }
- if !cli.select.is_empty() {
- settings.select(cli.select);
- }
- if !cli.ignore.is_empty() {
- settings.ignore(&cli.ignore);
- }
-
- if cli.show_settings && cli.show_files {
- println!("Error: specify --show-settings or show-files (not both).");
- return Ok(ExitCode::FAILURE);
- }
- if cli.show_settings {
- show_settings(&settings);
- return Ok(ExitCode::SUCCESS);
- }
- if cli.show_files {
- show_files(&cli.files, &settings);
- return Ok(ExitCode::SUCCESS);
- }
-
- cache::init()?;
-
- let mut printer = Printer::new(cli.format, cli.verbose);
- if cli.watch {
- if cli.fix {
- println!("Warning: --fix is not enabled in watch mode.");
- }
-
- if cli.format != SerializationFormat::Text {
- println!("Warning: --format 'text' is used in watch mode.");
- }
-
- // Perform an initial run instantly.
- printer.clear_screen()?;
- tell_user!("Starting linter in watch mode...\n");
-
- let messages = run_once(&cli.files, &settings, !cli.no_cache, false)?;
- if !cli.quiet {
- printer.write_continuously(&messages)?;
- }
-
- // Configure the file watcher.
- let (tx, rx) = channel();
- let mut watcher = raw_watcher(tx)?;
- for file in &cli.files {
- watcher.watch(file, RecursiveMode::Recursive)?;
- }
-
- loop {
- match rx.recv() {
- Ok(e) => {
- if let Some(path) = e.path {
- if path.to_string_lossy().ends_with(".py") {
- printer.clear_screen()?;
- tell_user!("File change detected...\n");
-
- let messages = run_once(&cli.files, &settings, !cli.no_cache, false)?;
- if !cli.quiet {
- printer.write_continuously(&messages)?;
- }
- }
- }
- }
- Err(e) => return Err(e.into()),
- }
- }
- } else {
- let messages = run_once(&cli.files, &settings, !cli.no_cache, cli.fix)?;
- if !cli.quiet {
- printer.write_once(&messages)?;
- }
-
- #[cfg(feature = "update-informer")]
- check_for_updates();
-
- if !messages.is_empty() && !cli.exit_zero {
- return Ok(ExitCode::FAILURE);
- }
- }
-
- Ok(ExitCode::SUCCESS)
-}
-
-fn main() -> ExitCode {
- match inner_main() {
- Ok(code) => code,
- Err(_) => ExitCode::FAILURE,
- }
-}
diff --git a/src/message.rs b/src/message.rs
deleted file mode 100644
index f273111a7c..0000000000
--- a/src/message.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use std::cmp::Ordering;
-use std::fmt;
-use std::path::Path;
-
-use colored::Colorize;
-use rustpython_parser::ast::Location;
-use serde::{Deserialize, Serialize};
-
-use crate::checks::CheckKind;
-use crate::fs::relativize_path;
-
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Message {
- pub kind: CheckKind,
- pub fixed: bool,
- pub location: Location,
- pub filename: String,
-}
-
-impl Ord for Message {
- fn cmp(&self, other: &Self) -> Ordering {
- (&self.filename, self.location.row(), self.location.column()).cmp(&(
- &other.filename,
- other.location.row(),
- other.location.column(),
- ))
- }
-}
-
-impl PartialOrd for Message {
- fn partial_cmp(&self, other: &Self) -> Option {
- Some(self.cmp(other))
- }
-}
-
-impl fmt::Display for Message {
- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
- write!(
- f,
- "{}{}{}{}{}{} {} {}",
- relativize_path(Path::new(&self.filename)).white().bold(),
- // self.filename.white(),
- ":".cyan(),
- self.location.row(),
- ":".cyan(),
- self.location.column(),
- ":".cyan(),
- self.kind.code().as_str().red().bold(),
- self.kind.body()
- )
- }
-}
diff --git a/src/printer.rs b/src/printer.rs
deleted file mode 100644
index 1a181e1114..0000000000
--- a/src/printer.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use anyhow::Result;
-use clap::ValueEnum;
-use colored::Colorize;
-
-use crate::message::Message;
-use crate::tell_user;
-
-#[derive(Clone, Copy, ValueEnum, PartialEq, Eq, Debug)]
-pub enum SerializationFormat {
- Text,
- Json,
-}
-
-pub struct Printer {
- format: SerializationFormat,
- verbose: bool,
-}
-
-impl Printer {
- pub fn new(format: SerializationFormat, verbose: bool) -> Self {
- Self { format, verbose }
- }
-
- pub fn write_once(&mut self, messages: &[Message]) -> Result<()> {
- let (fixed, outstanding): (Vec<&Message>, Vec<&Message>) =
- messages.iter().partition(|message| message.fixed);
- let num_fixable = outstanding
- .iter()
- .filter(|message| message.kind.fixable())
- .count();
-
- match self.format {
- SerializationFormat::Json => {
- println!("{}", serde_json::to_string_pretty(&messages)?)
- }
- SerializationFormat::Text => {
- if !fixed.is_empty() {
- println!(
- "Found {} error(s) ({} fixed).",
- outstanding.len(),
- fixed.len()
- )
- } else if !outstanding.is_empty() || self.verbose {
- println!("Found {} error(s).", outstanding.len())
- }
-
- for message in outstanding {
- println!("{}", message)
- }
-
- if num_fixable > 0 {
- println!("{num_fixable} potentially fixable with the --fix option.")
- }
- }
- }
-
- Ok(())
- }
-
- pub fn write_continuously(&mut self, messages: &[Message]) -> Result<()> {
- tell_user!(
- "Found {} error(s). Watching for file changes.",
- messages.len(),
- );
-
- if !messages.is_empty() {
- println!();
- for message in messages {
- println!("{}", message)
- }
- }
-
- Ok(())
- }
-
- pub fn clear_screen(&mut self) -> Result<()> {
- clearscreen::clear()?;
- Ok(())
- }
-}
diff --git a/src/pyproject.rs b/src/pyproject.rs
deleted file mode 100644
index 7b3a6d8151..0000000000
--- a/src/pyproject.rs
+++ /dev/null
@@ -1,289 +0,0 @@
-use std::path::{Path, PathBuf};
-
-use anyhow::Result;
-use common_path::common_path_all;
-use path_absolutize::Absolutize;
-use serde::Deserialize;
-
-use crate::checks::CheckCode;
-use crate::fs;
-
-pub fn load_config(pyproject: &Option) -> Config {
- match pyproject {
- Some(pyproject) => match parse_pyproject_toml(pyproject) {
- Ok(pyproject) => pyproject
- .tool
- .and_then(|tool| tool.ruff)
- .unwrap_or_default(),
- Err(e) => {
- println!("Failed to load pyproject.toml: {:?}", e);
- println!("Falling back to default configuration...");
- Default::default()
- }
- },
- None => {
- println!("No pyproject.toml found.");
- println!("Falling back to default configuration...");
- Default::default()
- }
- }
-}
-
-#[derive(Debug, PartialEq, Eq, Deserialize, Default)]
-#[serde(deny_unknown_fields, rename_all = "kebab-case")]
-pub struct Config {
- pub line_length: Option,
- pub exclude: Option>,
- pub extend_exclude: Option>,
- pub select: Option>,
- pub ignore: Option>,
-}
-
-#[derive(Debug, PartialEq, Eq, Deserialize)]
-struct Tools {
- ruff: Option,
-}
-
-#[derive(Debug, PartialEq, Eq, Deserialize)]
-struct PyProject {
- tool: Option,
-}
-
-fn parse_pyproject_toml(path: &Path) -> Result {
- let contents = fs::read_file(path)?;
- toml::from_str(&contents).map_err(|e| e.into())
-}
-
-pub fn find_pyproject_toml(path: &Option) -> Option {
- if let Some(path) = path {
- let path_pyproject_toml = path.join("pyproject.toml");
- if path_pyproject_toml.is_file() {
- return Some(path_pyproject_toml);
- }
- }
-
- find_user_pyproject_toml()
-}
-
-fn find_user_pyproject_toml() -> Option {
- let mut path = dirs::config_dir()?;
- path.push("ruff");
- path.push("pyproject.toml");
- if path.is_file() {
- Some(path)
- } else {
- None
- }
-}
-
-pub fn find_project_root(sources: &[PathBuf]) -> Option {
- let absolute_sources: Vec = sources
- .iter()
- .flat_map(|source| source.absolutize().map(|path| path.to_path_buf()))
- .collect();
- if let Some(prefix) = common_path_all(absolute_sources.iter().map(PathBuf::as_path)) {
- for directory in prefix.ancestors() {
- if directory.join(".git").is_dir() {
- return Some(directory.to_path_buf());
- }
- if directory.join(".hg").is_dir() {
- return Some(directory.to_path_buf());
- }
- if directory.join("pyproject.toml").is_file() {
- return Some(directory.to_path_buf());
- }
- }
- }
-
- None
-}
-
-#[cfg(test)]
-mod tests {
- use std::env::current_dir;
- use std::path::PathBuf;
-
- use anyhow::Result;
-
- use crate::checks::CheckCode;
- use crate::pyproject::{
- find_project_root, find_pyproject_toml, parse_pyproject_toml, Config, PyProject, Tools,
- };
-
- #[test]
- fn deserialize() -> Result<()> {
- let pyproject: PyProject = toml::from_str(r#""#)?;
- assert_eq!(pyproject.tool, None);
-
- let pyproject: PyProject = toml::from_str(
- r#"
-[tool.black]
-"#,
- )?;
- assert_eq!(pyproject.tool, Some(Tools { ruff: None }));
-
- let pyproject: PyProject = toml::from_str(
- r#"
-[tool.black]
-[tool.ruff]
-"#,
- )?;
- assert_eq!(
- pyproject.tool,
- Some(Tools {
- ruff: Some(Config {
- line_length: None,
- exclude: None,
- extend_exclude: None,
- select: None,
- ignore: None,
- })
- })
- );
-
- let pyproject: PyProject = toml::from_str(
- r#"
-[tool.black]
-[tool.ruff]
-line-length = 79
-"#,
- )?;
- assert_eq!(
- pyproject.tool,
- Some(Tools {
- ruff: Some(Config {
- line_length: Some(79),
- exclude: None,
- extend_exclude: None,
- select: None,
- ignore: None,
- })
- })
- );
-
- let pyproject: PyProject = toml::from_str(
- r#"
-[tool.black]
-[tool.ruff]
-exclude = ["foo.py"]
-"#,
- )?;
- assert_eq!(
- pyproject.tool,
- Some(Tools {
- ruff: Some(Config {
- line_length: None,
- exclude: Some(vec!["foo.py".to_string()]),
- extend_exclude: None,
- select: None,
- ignore: None,
- })
- })
- );
-
- let pyproject: PyProject = toml::from_str(
- r#"
-[tool.black]
-[tool.ruff]
-select = ["E501"]
-"#,
- )?;
- assert_eq!(
- pyproject.tool,
- Some(Tools {
- ruff: Some(Config {
- line_length: None,
- exclude: None,
- extend_exclude: None,
- select: Some(vec![CheckCode::E501]),
- ignore: None,
- })
- })
- );
-
- let pyproject: PyProject = toml::from_str(
- r#"
-[tool.black]
-[tool.ruff]
-ignore = ["E501"]
-"#,
- )?;
- assert_eq!(
- pyproject.tool,
- Some(Tools {
- ruff: Some(Config {
- line_length: None,
- exclude: None,
- extend_exclude: None,
- select: None,
- ignore: Some(vec![CheckCode::E501]),
- })
- })
- );
-
- assert!(toml::from_str::(
- r#"
-[tool.black]
-[tool.ruff]
-line_length = 79
-"#,
- )
- .is_err());
-
- assert!(toml::from_str::(
- r#"
-[tool.black]
-[tool.ruff]
-select = ["E123"]
-"#,
- )
- .is_err());
-
- assert!(toml::from_str::(
- r#"
-[tool.black]
-[tool.ruff]
-line-length = 79
-other-attribute = 1
-"#,
- )
- .is_err());
-
- Ok(())
- }
-
- #[test]
- fn find_and_parse_pyproject_toml() -> Result<()> {
- let cwd = current_dir()?;
- let project_root =
- find_project_root(&[PathBuf::from("resources/test/fixtures/__init__.py")])
- .expect("Unable to find project root.");
- assert_eq!(project_root, cwd.join("resources/test/fixtures"));
-
- let path =
- find_pyproject_toml(&Some(project_root)).expect("Unable to find pyproject.toml.");
- assert_eq!(path, cwd.join("resources/test/fixtures/pyproject.toml"));
-
- let pyproject = parse_pyproject_toml(&path)?;
- let config = pyproject
- .tool
- .and_then(|tool| tool.ruff)
- .expect("Unable to find tool.ruff.");
- assert_eq!(
- config,
- Config {
- line_length: Some(88),
- exclude: None,
- extend_exclude: Some(vec![
- "excluded.py".to_string(),
- "migrations".to_string(),
- "directory/also_excluded.py".to_string(),
- ]),
- select: None,
- ignore: None,
- }
- );
-
- Ok(())
- }
-}
diff --git a/src/settings.rs b/src/settings.rs
index 37cf5112a4..9e11557c55 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -1,68 +1,25 @@
use std::collections::BTreeSet;
use std::hash::{Hash, Hasher};
-use std::path::{Path, PathBuf};
-use glob::Pattern;
-use once_cell::sync::Lazy;
-
-use crate::checks::{CheckCode, ALL_CHECK_CODES};
-use crate::fs;
-use crate::pyproject::load_config;
-
-#[derive(Debug, Clone)]
-pub enum FilePattern {
- Simple(&'static str),
- Complex(Pattern, Option),
-}
-
-impl FilePattern {
- pub fn from_user(pattern: &str, project_root: &Option) -> Self {
- let path = Path::new(pattern);
- let absolute_path = match project_root {
- Some(project_root) => fs::normalize_path_to(path, project_root),
- None => fs::normalize_path(path),
- };
-
- let absolute = Pattern::new(&absolute_path.to_string_lossy()).expect("Invalid pattern.");
- let basename = if !pattern.contains(std::path::MAIN_SEPARATOR) {
- Some(Pattern::new(pattern).expect("Invalid pattern."))
- } else {
- None
- };
-
- FilePattern::Complex(absolute, basename)
- }
-}
+use crate::checks::CheckCode;
#[derive(Debug)]
pub struct Settings {
- pub pyproject: Option,
- pub project_root: Option,
pub line_length: usize,
- pub exclude: Vec,
- pub extend_exclude: Vec,
pub select: BTreeSet,
}
impl Settings {
pub fn for_rule(check_code: CheckCode) -> Self {
Self {
- pyproject: None,
- project_root: None,
line_length: 88,
- exclude: vec![],
- extend_exclude: vec![],
select: BTreeSet::from([check_code]),
}
}
pub fn for_rules(check_codes: Vec) -> Self {
Self {
- pyproject: None,
- project_root: None,
line_length: 88,
- exclude: vec![],
- extend_exclude: vec![],
select: BTreeSet::from_iter(check_codes),
}
}
@@ -76,78 +33,3 @@ impl Hash for Settings {
}
}
}
-
-static DEFAULT_EXCLUDE: Lazy> = Lazy::new(|| {
- vec![
- FilePattern::Simple(".bzr"),
- FilePattern::Simple(".direnv"),
- FilePattern::Simple(".eggs"),
- FilePattern::Simple(".git"),
- FilePattern::Simple(".hg"),
- FilePattern::Simple(".mypy_cache"),
- FilePattern::Simple(".nox"),
- FilePattern::Simple(".pants.d"),
- FilePattern::Simple(".ruff_cache"),
- FilePattern::Simple(".svn"),
- FilePattern::Simple(".tox"),
- FilePattern::Simple(".venv"),
- FilePattern::Simple("__pypackages__"),
- FilePattern::Simple("_build"),
- FilePattern::Simple("buck-out"),
- FilePattern::Simple("build"),
- FilePattern::Simple("dist"),
- FilePattern::Simple("node_modules"),
- FilePattern::Simple("venv"),
- ]
-});
-
-impl Settings {
- pub fn from_pyproject(pyproject: Option, project_root: Option) -> Self {
- let config = load_config(&pyproject);
- let mut settings = Settings {
- line_length: config.line_length.unwrap_or(88),
- exclude: config
- .exclude
- .map(|paths| {
- paths
- .iter()
- .map(|path| FilePattern::from_user(path, &project_root))
- .collect()
- })
- .unwrap_or_else(|| DEFAULT_EXCLUDE.clone()),
- extend_exclude: config
- .extend_exclude
- .map(|paths| {
- paths
- .iter()
- .map(|path| FilePattern::from_user(path, &project_root))
- .collect()
- })
- .unwrap_or_default(),
- select: if let Some(select) = config.select {
- BTreeSet::from_iter(select)
- } else {
- BTreeSet::from_iter(ALL_CHECK_CODES)
- },
- pyproject,
- project_root,
- };
- if let Some(ignore) = &config.ignore {
- settings.ignore(ignore);
- }
- settings
- }
-
- pub fn select(&mut self, codes: Vec) {
- self.select.clear();
- for code in codes {
- self.select.insert(code);
- }
- }
-
- pub fn ignore(&mut self, codes: &[CheckCode]) {
- for code in codes {
- self.select.remove(code);
- }
- }
-}