diff --git a/Cargo.lock b/Cargo.lock index 8fe0e0bd4e..befac40e1e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -289,9 +289,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.6" +version = "4.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" +checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" dependencies = [ "bitflags", "clap_derive", @@ -308,7 +308,7 @@ version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd125be87bf4c255ebc50de0b7f4d2a6201e8ac3dc86e39c0ad081dc5e7236fe" dependencies = [ - "clap 4.1.6", + "clap 4.1.8", ] [[package]] @@ -317,7 +317,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4160b4a4f72ef58bd766bad27c09e6ef1cc9d82a22f6a0f55d152985a4a48e31" dependencies = [ - "clap 4.1.6", + "clap 4.1.8", "clap_complete", "clap_complete_fig", ] @@ -328,15 +328,15 @@ version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63a06158a72dbb088f864887b4409fd22600ba379f3cee3040f842234cc5c2d0" dependencies = [ - "clap 4.1.6", + "clap 4.1.8", "clap_complete", ] [[package]] name = "clap_derive" -version = "4.1.0" +version = "4.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0" dependencies = [ "heck", "proc-macro-error", @@ -427,9 +427,9 @@ dependencies = [ [[package]] name = "console_log" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494" +checksum = "878ad067d4089144a36ee412d665916c665430eb84c0057b9987f424a5d15c03" dependencies = [ "log", "web-sys", @@ -773,7 +773,7 @@ name = "flake8-to-ruff" version = "0.0.254" dependencies = [ "anyhow", - "clap 4.1.6", + "clap 4.1.8", "colored", "configparser", "once_cell", @@ -1363,15 +1363,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "nom8" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" -dependencies = [ - "memchr", -] - [[package]] name = "notify" version = "5.1.0" @@ -1831,9 +1822,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -1841,9 +1832,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.2" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -1949,7 +1940,7 @@ dependencies = [ "bitflags", "cfg-if", "chrono", - "clap 4.1.6", + "clap 4.1.8", "colored", "console_error_panic_hook", "console_log", @@ -2022,7 +2013,7 @@ dependencies = [ "bitflags", "cachedir", "chrono", - "clap 4.1.6", + "clap 4.1.8", "clap_complete_command", "clearscreen", "colored", @@ -2056,7 +2047,7 @@ name = "ruff_dev" version = "0.0.0" dependencies = [ "anyhow", - "clap 4.1.6", + "clap 4.1.8", "itertools", "libcst", "once_cell", @@ -2111,7 +2102,7 @@ name = "ruff_python_formatter" version = "0.0.0" dependencies = [ "anyhow", - "clap 4.1.6", + "clap 4.1.8", "insta", "is-macro", "itertools", @@ -2297,9 +2288,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5fb6c61f29e723026dc8e923d94c694313212abbecbbe5f55a7748eec5b307" +checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" dependencies = [ "dyn-clone", "schemars_derive", @@ -2309,9 +2300,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9" +checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" dependencies = [ "proc-macro2", "quote", @@ -2523,9 +2514,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.108" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56e159d99e6c2b93995d171050271edb50ecc5288fbc7cc17de8fdce4e58c14" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -2596,18 +2587,18 @@ checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" [[package]] name = "test-case" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d6cf5a7dffb3f9dceec8e6b8ca528d9bd71d36c9f074defb548ce161f598c0" +checksum = "679b019fb241da62cc449b33b224d19ebe1c6767b495569765115dd7f7f9fba4" dependencies = [ "test-case-macros", ] [[package]] -name = "test-case-macros" -version = "2.2.2" +name = "test-case-core" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e45b7bf6e19353ddd832745c8fcf77a17a93171df7151187f26623f2b75b5b26" +checksum = "72dc21b5887f4032c4656502d085dc28f2afbb686f25f216472bb0526f4b1b88" dependencies = [ "cfg-if", "proc-macro-error", @@ -2616,6 +2607,19 @@ dependencies = [ "syn", ] +[[package]] +name = "test-case-macros" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3786898e0be151a96f730fd529b0e8a10f5990fa2a7ea14e37ca27613c05190" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn", + "test-case-core", +] + [[package]] name = "textwrap" version = "0.16.0" @@ -2724,9 +2728,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217" +checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6" dependencies = [ "serde", "serde_spanned", @@ -2736,24 +2740,24 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.18.1" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" +checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825" dependencies = [ "indexmap", - "nom8", "serde", "serde_spanned", "toml_datetime", + "winnow", ] [[package]] @@ -3244,6 +3248,15 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +[[package]] +name = "winnow" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf09497b8f8b5ac5d3bb4d05c0a99be20f26fd3d5f2db7b0716e946d5103658" +dependencies = [ + "memchr", +] + [[package]] name = "yaml-rust" version = "0.4.5" diff --git a/Cargo.toml b/Cargo.toml index 2cdd7d2822..df51110a4b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,22 +6,42 @@ edition = "2021" rust-version = "1.67.0" [workspace.dependencies] -anyhow = { version = "1.0.66" } -clap = { version = "4.0.1", features = ["derive"] } -itertools = { version = "0.10.5" } +anyhow = { version = "1.0.69" } +bitflags = { version = "1.3.2" } +chrono = { version = "0.4.23", default-features = false, features = ["clock"] } +clap = { version = "4.1.8", features = ["derive"] } +colored = { version = "2.0.0" } +filetime = { version = "0.2.20" } +glob = { version = "0.3.1" } +globset = { version = "0.4.10" } +ignore = { version = "0.4.20" } +insta = { version = "1.28.0" } is-macro = { version = "0.2.2" } +itertools = { version = "0.10.5" } libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "80e4c1399f95e5beb532fdd1e209ad2dbb470438" } -once_cell = { version = "1.16.0" } -regex = { version = "1.6.0" } +log = { version = "0.4.17" } +once_cell = { version = "1.17.1" } +path-absolutize = { version = "3.0.14" } +proc-macro2 = { version = "1.0.51" } +quote = { version = "1.0.23" } +regex = { version = "1.7.1" } rustc-hash = { version = "1.1.0" } rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "822f6a9fa6b9142413634858c4c6908f678ce887" } -rustpython-parser = { features = ["lalrpop", "serde"], git = "https://github.com/RustPython/RustPython.git", rev = "822f6a9fa6b9142413634858c4c6908f678ce887" } -schemars = { version = "0.8.11" } -serde = { version = "1.0.147", features = ["derive"] } -serde_json = { version = "1.0.87" } +rustpython-parser = { features = [ + "lalrpop", + "serde", +], git = "https://github.com/RustPython/RustPython.git", rev = "822f6a9fa6b9142413634858c4c6908f678ce887" } +schemars = { version = "0.8.12" } +serde = { version = "1.0.152", features = ["derive"] } +serde_json = { version = "1.0.93" } +shellexpand = { version = "3.0.0" } +similar = { version = "2.2.1" } strum = { version = "0.24.1", features = ["strum_macros"] } strum_macros = { version = "0.24.3" } -toml = { version = "0.6.0" } +syn = { version = "1.0.109" } +test-case = { version = "3.0.0" } +textwrap = { version = "0.16.0" } +toml = { version = "0.7.2" } [profile.release] panic = "abort" diff --git a/crates/flake8_to_ruff/Cargo.toml b/crates/flake8_to_ruff/Cargo.toml index 4315a7ae30..b922c356be 100644 --- a/crates/flake8_to_ruff/Cargo.toml +++ b/crates/flake8_to_ruff/Cargo.toml @@ -7,7 +7,7 @@ rust-version = { workspace = true } [dependencies] anyhow = { workspace = true } clap = { workspace = true } -colored = { version = "2.0.0" } +colored = { workspace = true } configparser = { version = "3.0.2" } once_cell = { workspace = true } regex = { workspace = true } diff --git a/crates/ruff/Cargo.toml b/crates/ruff/Cargo.toml index 3d05265180..b55d574638 100644 --- a/crates/ruff/Cargo.toml +++ b/crates/ruff/Cargo.toml @@ -23,57 +23,60 @@ ruff_cache = { path = "../ruff_cache" } anyhow = { workspace = true } bisection = { version = "0.1.0" } -bitflags = { version = "1.3.2" } +bitflags = { workspace = true } cfg-if = { version = "1.0.0" } -chrono = { version = "0.4.21", default-features = false, features = ["clock"] } +chrono = { workspace = true } clap = { workspace = true, features = ["derive", "env", "string"] } -colored = { version = "2.0.0" } +colored = { workspace = true } derivative = { version = "2.2.0" } dirs = { version = "4.0.0" } fern = { version = "0.6.1" } -glob = { version = "0.3.0" } -globset = { version = "0.4.9" } -ignore = { version = "0.4.18" } -imperative = { version = "1.0.3" } +glob = { workspace = true } +globset = { workspace = true } +ignore = { workspace = true } +imperative = { version = "1.0.4" } is-macro = { workspace = true } itertools = { workspace = true } libcst = { workspace = true } -log = { version = "0.4.17" } +log = { workspace = true } natord = { version = "1.0.9" } nohash-hasher = { version = "0.2.0" } num-bigint = { version = "0.4.3" } -num-traits = "0.2.15" +num-traits = { version = "0.2.15" } once_cell = { workspace = true } -path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix_paths_on_wasm"] } +path-absolutize = { workspace = true, features = [ + "once_cell_cache", + "use_unix_paths_on_wasm", +] } regex = { workspace = true } -result-like = "0.4.6" +result-like = { version = "0.4.6" } rustc-hash = { workspace = true } rustpython-common = { workspace = true } rustpython-parser = { workspace = true } schemars = { workspace = true } semver = { version = "1.0.16" } serde = { workspace = true } -shellexpand = { version = "3.0.0" } +shellexpand = { workspace = true } smallvec = { version = "1.10.0" } strum = { workspace = true } strum_macros = { workspace = true } -textwrap = { version = "0.16.0" } -thiserror = { version = "1.0" } +textwrap = { workspace = true } +thiserror = { version = "1.0.38" } toml = { workspace = true } # https://docs.rs/getrandom/0.2.7/getrandom/#webassembly-support [target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dependencies] -getrandom = { version = "0.2.7", features = ["js"] } +getrandom = { version = "0.2.8", features = ["js"] } console_error_panic_hook = { version = "0.1.7" } -console_log = { version = "0.2.0" } -serde-wasm-bindgen = { version = "0.4" } -js-sys = { version = "0.3.60" } -wasm-bindgen = { version = "0.2.83" } +console_log = { version = "0.2.1" } +serde-wasm-bindgen = { version = "0.4.5" } +js-sys = { version = "0.3.61" } +wasm-bindgen = { version = "0.2.84" } [dev-dependencies] -insta = { version = "1.19.0", features = ["yaml", "redactions"] } -test-case = { version = "2.2.2" } -wasm-bindgen-test = { version = "0.3.33" } +insta = { workspace = true, features = ["yaml", "redactions"] } +test-case = { workspace = true } +wasm-bindgen-test = { version = "0.3.34" } [target.'cfg(not(target_family = "wasm"))'.dev-dependencies] criterion = { version = "0.4.0" } diff --git a/crates/ruff_cache/Cargo.toml b/crates/ruff_cache/Cargo.toml index faf06f72f5..b38e4cba04 100644 --- a/crates/ruff_cache/Cargo.toml +++ b/crates/ruff_cache/Cargo.toml @@ -7,9 +7,9 @@ rust-version = { workspace = true } [dependencies] itertools = { workspace = true } -globset = { version = "0.4.9" } +globset = { workspace = true } regex = { workspace = true } -filetime = { version = "0.2.17" } +filetime = { workspace = true } [dev-dependencies] ruff_macros = { path = "../ruff_macros" } diff --git a/crates/ruff_cli/Cargo.toml b/crates/ruff_cli/Cargo.toml index e53d5c3c59..6e3be6de62 100644 --- a/crates/ruff_cli/Cargo.toml +++ b/crates/ruff_cli/Cargo.toml @@ -31,42 +31,41 @@ annotate-snippets = { version = "0.9.1", features = ["color"] } anyhow = { workspace = true } atty = { version = "0.2.14" } bincode = { version = "1.3.3" } -bitflags = { version = "1.3.2" } +bitflags = { workspace = true } cachedir = { version = "0.3.0" } -chrono = { version = "0.4.21", default-features = false, features = ["clock"] } +chrono = { workspace = true } clap = { workspace = true, features = ["derive", "env"] } clap_complete_command = { version = "0.4.0" } clearscreen = { version = "2.0.0" } -colored = { version = "2.0.0" } -filetime = { version = "0.2.17" } -glob = { version = "0.3.0" } -ignore = { version = "0.4.18" } +colored = { workspace = true } +filetime = { workspace = true } +glob = { workspace = true } +ignore = { workspace = true } itertools = { workspace = true } -log = { version = "0.4.17" } -notify = { version = "5.0.0" } -path-absolutize = { version = "3.0.14", features = ["once_cell_cache"] } +log = { workspace = true } +notify = { version = "5.1.0" } +path-absolutize = { workspace = true, features = ["once_cell_cache"] } quick-junit = { version = "0.3.2" } -rayon = { version = "1.5.3" } +rayon = { version = "1.7.0" } regex = { workspace = true } rustc-hash = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -shellexpand = { version = "3.0.0" } -similar = { version = "2.2.1" } -strum = { version = "0.24.1" } -textwrap = { version = "0.16.0" } +shellexpand = { workspace = true } +similar = { workspace = true } +strum = { workspace = true, features = [] } +textwrap = { workspace = true } walkdir = { version = "2.3.2" } [dev-dependencies] -assert_cmd = { version = "2.0.4" } -strum = { version = "0.24.1" } -ureq = { version = "2.5.0", features = [] } +assert_cmd = { version = "2.0.8" } +ureq = { version = "2.6.2", features = [] } [package.metadata.maturin] name = "ruff" [target.'cfg(target_os = "windows")'.dependencies] -mimalloc = "0.1.29" +mimalloc = "0.1.34" [target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64")))'.dependencies] tikv-jemallocator = "0.5.0" diff --git a/crates/ruff_dev/Cargo.toml b/crates/ruff_dev/Cargo.toml index 0f8c06794a..9121bb7cbf 100644 --- a/crates/ruff_dev/Cargo.toml +++ b/crates/ruff_dev/Cargo.toml @@ -17,7 +17,7 @@ ruff_cli = { path = "../ruff_cli" } rustpython-common = { workspace = true } rustpython-parser = { workspace = true } schemars = { workspace = true } -serde_json = { version = "1.0.91" } +serde_json = { workspace = true } strum = { workspace = true } strum_macros = { workspace = true } -textwrap = { version = "0.16.0" } +textwrap = { workspace = true } diff --git a/crates/ruff_formatter/Cargo.toml b/crates/ruff_formatter/Cargo.toml index 52a132c36d..e4e6cf243e 100644 --- a/crates/ruff_formatter/Cargo.toml +++ b/crates/ruff_formatter/Cargo.toml @@ -6,16 +6,17 @@ edition = { workspace = true } rust-version = { workspace = true } [dependencies] -drop_bomb = { version = "0.1.5" } ruff_text_size = { path = "../ruff_text_size" } + +drop_bomb = { version = "0.1.5" } rustc-hash = { workspace = true } -schemars = { version = "0.8.10", optional = true } -serde = { version = "1.0.136", features = ["derive"], optional = true } -tracing = { version = "0.1.31", default-features = false, features = ["std"] } -unicode-width = { version = "0.1.9" } +schemars = { workspace = true, optional = true } +serde = { workspace = true, optional = true } +tracing = { version = "0.1.37", default-features = false, features = ["std"] } +unicode-width = { version = "0.1.10" } [dev-dependencies] -insta = { version = "1.19.0" } +insta = { workspace = true } [features] serde = ["dep:serde", "schemars"] diff --git a/crates/ruff_macros/Cargo.toml b/crates/ruff_macros/Cargo.toml index e48c4e45d4..b2c9b7ca99 100644 --- a/crates/ruff_macros/Cargo.toml +++ b/crates/ruff_macros/Cargo.toml @@ -10,9 +10,8 @@ proc-macro = true doctest = false [dependencies] -proc-macro2 = { version = "1.0.47" } -quote = { version = "1.0.21" } -syn = { version = "1.0.103", features = ["derive", "parsing", "extra-traits"] } -textwrap = { version = "0.16.0" } +proc-macro2 = { workspace = true } +quote = { workspace = true } +syn = { workspace = true, features = ["derive", "parsing", "extra-traits"] } +textwrap = { workspace = true } itertools = { workspace = true } - diff --git a/crates/ruff_python_formatter/Cargo.toml b/crates/ruff_python_formatter/Cargo.toml index 262ee2077b..44add45612 100644 --- a/crates/ruff_python_formatter/Cargo.toml +++ b/crates/ruff_python_formatter/Cargo.toml @@ -23,6 +23,6 @@ rustpython-parser = { workspace = true } [dev-dependencies] ruff_testing_macros = { path = "../ruff_testing_macros" } -insta = { version = "1.19.0", features = [] } -test-case = { version = "2.2.2" } -similar = { version = "2.2.1" } +insta = { workspace = true, features = [] } +test-case = { workspace = true } +similar = { workspace = true } diff --git a/crates/ruff_testing_macros/Cargo.toml b/crates/ruff_testing_macros/Cargo.toml index 7f2a3b4a8a..88e0f6ae72 100644 --- a/crates/ruff_testing_macros/Cargo.toml +++ b/crates/ruff_testing_macros/Cargo.toml @@ -10,8 +10,8 @@ proc-macro = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -glob = "0.3.1" +glob = { workspace = true } proc-macro-error = { version = "1.0.4", default-features = false } -proc-macro2 = "1.0.36" -quote = "1.0.14" -syn = "1.0.107" +proc-macro2 = { workspace = true } +quote = { workspace = true } +syn = { workspace = true } diff --git a/crates/ruff_text_size/Cargo.toml b/crates/ruff_text_size/Cargo.toml index 90056d0766..7c565debe4 100644 --- a/crates/ruff_text_size/Cargo.toml +++ b/crates/ruff_text_size/Cargo.toml @@ -6,12 +6,13 @@ edition = { workspace = true } rust-version = { workspace = true } [dependencies] -serde = { version = "1.0", optional = true, default_features = false } -schemars = { version = "0.8.10", optional = true } +serde = { workspace = true, optional = true, default_features = false, features = [ +] } +schemars = { workspace = true, optional = true } [dev-dependencies] -serde_test = "1.0" -static_assertions = "1.1" +serde_test = { version = "1.0.152" } +static_assertions = { version = "1.1.0" } [[test]] name = "serde"