Unverified Commit 31a13164 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #319920 from GaetanLepage/ruff 

ruff: 0.4.8 -> 0.4.9
parents 971ea0a2 07536069

pkgs/development/tools/ruff/Cargo.lock

+215 −72
Original line number Diff line number Diff line
@@ -133,6 +133,12 @@ version = "1.0.86" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"



[[package]]

name = "arc-swap"

version = "1.7.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"



[[package]]

name = "argfile"

version = "0.2.0"
@@ -199,6 +205,12 @@ version = "3.16.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"



[[package]]

name = "byteorder"

version = "1.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"



[[package]]

name = "cachedir"

version = "0.3.1"
@@ -208,6 +220,12 @@ dependencies = [ 
 "tempfile",

]



[[package]]

name = "camino"

version = "1.1.7"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239"



[[package]]

name = "cast"

version = "0.3.0"
@@ -219,6 +237,11 @@ name = "cc" 
version = "1.0.95"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b"

dependencies = [

 "jobserver",

 "libc",

 "once_cell",

]



[[package]]

name = "cfg-if"
@@ -282,9 +305,9 @@ dependencies = [ 


[[package]]

name = "clap"

version = "4.5.4"

version = "4.5.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"

checksum = "a9689a29b593160de5bc4aacab7b5d54fb52231de70122626c178e6a368994c7"

dependencies = [

 "clap_builder",

 "clap_derive",
@@ -292,9 +315,9 @@ dependencies = [ 


[[package]]

name = "clap_builder"

version = "4.5.2"

version = "4.5.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"

checksum = "2e5387378c84f6faa26890ebf9f0a92989f8873d4d380467bcd0d8d8620424df"

dependencies = [

 "anstream",

 "anstyle",
@@ -346,14 +369,14 @@ dependencies = [ 


[[package]]

name = "clap_derive"

version = "4.5.4"

version = "4.5.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"

checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"

dependencies = [

 "heck",

 "heck 0.5.0",

 "proc-macro2",

 "quote",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -594,7 +617,7 @@ dependencies = [ 
 "proc-macro2",

 "quote",

 "strsim 0.10.0",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -605,7 +628,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" 
dependencies = [

 "darling_core",

 "quote",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -731,6 +754,16 @@ dependencies = [ 
 "windows-sys 0.52.0",

]



[[package]]

name = "eyre"

version = "0.6.12"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"

dependencies = [

 "indenter",

 "once_cell",

]



[[package]]

name = "fastrand"

version = "2.0.2"
@@ -868,6 +901,21 @@ dependencies = [ 
 "allocator-api2",

]



[[package]]

name = "hashlink"

version = "0.8.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"

dependencies = [

 "hashbrown 0.14.5",

]



[[package]]

name = "heck"

version = "0.4.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"



[[package]]

name = "heck"

version = "0.5.0"
@@ -970,6 +1018,12 @@ dependencies = [ 
 "rust-stemmers",

]



[[package]]

name = "indenter"

version = "0.3.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"



[[package]]

name = "indexmap"

version = "2.2.6"
@@ -1075,7 +1129,7 @@ dependencies = [ 
 "Inflector",

 "proc-macro2",

 "quote",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -1123,6 +1177,15 @@ version = "1.0.11" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"



[[package]]

name = "jobserver"

version = "0.1.31"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"

dependencies = [

 "libc",

]



[[package]]

name = "jod-thread"

version = "0.1.2"
@@ -1192,7 +1255,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "a2ae40017ac09cd2c6a53504cb3c871c7f2b41466eac5bc66ba63f39073b467b"

dependencies = [

 "quote",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -1630,15 +1693,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"



[[package]]

name = "pmutil"

version = "0.6.1"

name = "pkg-config"

version = "0.3.30"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6"

dependencies = [

 "proc-macro2",

 "quote",

 "syn",

]

checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"



[[package]]

name = "portable-atomic"
@@ -1778,6 +1836,8 @@ dependencies = [ 
 "dashmap",

 "hashbrown 0.14.5",

 "indexmap",

 "insta",

 "is-macro",

 "notify",

 "parking_lot",

 "rayon",
@@ -1785,6 +1845,7 @@ dependencies = [ 
 "ruff_notebook",

 "ruff_python_ast",

 "ruff_python_parser",

 "ruff_python_stdlib",

 "ruff_text_size",

 "rustc-hash",

 "smol_str",
@@ -1792,6 +1853,8 @@ dependencies = [ 
 "tracing",

 "tracing-subscriber",

 "tracing-tree",

 "walkdir",

 "zip",

]



[[package]]
@@ -1816,9 +1879,9 @@ dependencies = [ 


[[package]]

name = "regex"

version = "1.10.4"

version = "1.10.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"

checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"

dependencies = [

 "aho-corasick",

 "memchr",
@@ -1858,27 +1921,6 @@ version = "0.8.3" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"



[[package]]

name = "result-like"

version = "0.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "abf7172fef6a7d056b5c26bf6c826570267562d51697f4982ff3ba4aec68a9df"

dependencies = [

 "result-like-derive",

]



[[package]]

name = "result-like-derive"

version = "0.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a8d6574c02e894d66370cfc681e5d68fedbc9a548fb55b30a96b3f0ae22d0fe5"

dependencies = [

 "pmutil",

 "proc-macro2",

 "quote",

 "syn",

]



[[package]]

name = "ring"

version = "0.17.8"
@@ -1896,7 +1938,7 @@ dependencies = [ 


[[package]]

name = "ruff"

version = "0.4.8"

version = "0.4.9"

dependencies = [

 "anyhow",

 "argfile",
@@ -1942,8 +1984,6 @@ dependencies = [ 
 "tikv-jemallocator",

 "toml",

 "tracing",

 "tracing-subscriber",

 "tracing-tree",

 "walkdir",

 "wild",

]
@@ -1960,6 +2000,7 @@ dependencies = [ 
 "ruff_python_ast",

 "ruff_python_formatter",

 "ruff_python_parser",

 "ruff_python_trivia",

 "serde",

 "serde_json",

 "tikv-jemallocator",
@@ -1980,6 +2021,23 @@ dependencies = [ 
 "seahash",

]



[[package]]

name = "ruff_db"

version = "0.0.0"

dependencies = [

 "camino",

 "countme",

 "dashmap",

 "filetime",

 "ruff_python_ast",

 "ruff_python_parser",

 "ruff_source_file",

 "ruff_text_size",

 "rustc-hash",

 "salsa-2022",

 "tracing",

]



[[package]]

name = "ruff_dev"

version = "0.0.0"
@@ -2057,7 +2115,7 @@ dependencies = [ 


[[package]]

name = "ruff_linter"

version = "0.4.8"

version = "0.4.9"

dependencies = [

 "aho-corasick",

 "annotate-snippets 0.9.2",
@@ -2085,7 +2143,6 @@ dependencies = [ 
 "pyproject-toml",

 "quick-junit",

 "regex",

 "result-like",

 "ruff_cache",

 "ruff_diagnostics",

 "ruff_macros",
@@ -2125,7 +2182,7 @@ dependencies = [ 
 "proc-macro2",

 "quote",

 "ruff_python_trivia",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -2215,7 +2272,6 @@ dependencies = [ 
 "static_assertions",

 "thiserror",

 "tracing",

 "unicode-width",

]



[[package]]
@@ -2277,6 +2333,7 @@ version = "0.0.0" 
dependencies = [

 "bitflags 2.5.0",

 "is-macro",

 "ruff_db",

 "ruff_index",

 "ruff_python_ast",

 "ruff_python_parser",
@@ -2284,6 +2341,8 @@ dependencies = [ 
 "ruff_source_file",

 "ruff_text_size",

 "rustc-hash",

 "salsa-2022",

 "tracing",

]



[[package]]
@@ -2344,6 +2403,7 @@ dependencies = [ 
 "serde_json",

 "shellexpand",

 "tracing",

 "tracing-subscriber",

 "walkdir",

]
@@ -2382,6 +2442,7 @@ dependencies = [ 
 "ruff_python_formatter",

 "ruff_python_index",

 "ruff_python_parser",

 "ruff_python_trivia",

 "ruff_source_file",

 "ruff_text_size",

 "ruff_workspace",
@@ -2497,6 +2558,36 @@ version = "1.0.17" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"



[[package]]

name = "salsa-2022"

version = "0.1.0"

source = "git+https://github.com/salsa-rs/salsa.git?rev=05b4e3ebdcdc47730cdd359e7e97fb2470527279#05b4e3ebdcdc47730cdd359e7e97fb2470527279"

dependencies = [

 "arc-swap",

 "crossbeam",

 "crossbeam-utils",

 "dashmap",

 "hashlink",

 "indexmap",

 "log",

 "parking_lot",

 "rustc-hash",

 "salsa-2022-macros",

 "smallvec",

]



[[package]]

name = "salsa-2022-macros"

version = "0.1.0"

source = "git+https://github.com/salsa-rs/salsa.git?rev=05b4e3ebdcdc47730cdd359e7e97fb2470527279#05b4e3ebdcdc47730cdd359e7e97fb2470527279"

dependencies = [

 "eyre",

 "heck 0.4.1",

 "proc-macro2",

 "quote",

 "syn 1.0.109",

]



[[package]]

name = "same-file"

version = "1.0.6"
@@ -2527,7 +2618,7 @@ dependencies = [ 
 "proc-macro2",

 "quote",

 "serde_derive_internals",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -2576,7 +2667,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -2587,7 +2678,7 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -2609,7 +2700,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -2650,7 +2741,7 @@ dependencies = [ 
 "darling",

 "proc-macro2",

 "quote",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -2742,15 +2833,15 @@ dependencies = [ 


[[package]]

name = "strum_macros"

version = "0.26.3"

version = "0.26.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f7993a8e3a9e88a00351486baae9522c91b123a088f76469e5bd5cc17198ea87"

checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"

dependencies = [

 "heck",

 "heck 0.5.0",

 "proc-macro2",

 "quote",

 "rustversion",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -2759,6 +2850,17 @@ version = "2.5.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"



[[package]]

name = "syn"

version = "1.0.109"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"

dependencies = [

 "proc-macro2",

 "quote",

 "unicode-ident",

]



[[package]]

name = "syn"

version = "2.0.66"
@@ -2823,7 +2925,7 @@ dependencies = [ 
 "cfg-if",

 "proc-macro2",

 "quote",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -2834,7 +2936,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn",

 "syn 2.0.66",

 "test-case-core",

]
@@ -2855,7 +2957,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -2915,9 +3017,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" 


[[package]]

name = "toml"

version = "0.8.13"

version = "0.8.14"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba"

checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"

dependencies = [

 "serde",

 "serde_spanned",
@@ -2936,9 +3038,9 @@ dependencies = [ 


[[package]]

name = "toml_edit"

version = "0.22.13"

version = "0.22.14"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"

checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"

dependencies = [

 "indexmap",

 "serde",
@@ -2967,7 +3069,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -3197,7 +3299,7 @@ checksum = "9881bea7cbe687e36c9ab3b778c36cd0487402e270304e8b1296d5085303c1a2" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -3282,7 +3384,7 @@ dependencies = [ 
 "once_cell",

 "proc-macro2",

 "quote",

 "syn",

 "syn 2.0.66",

 "wasm-bindgen-shared",

]
@@ -3316,7 +3418,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn",

 "syn 2.0.66",

 "wasm-bindgen-backend",

 "wasm-bindgen-shared",

]
@@ -3349,7 +3451,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -3618,7 +3720,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn",

 "syn 2.0.66",

]



[[package]]
@@ -3626,3 +3728,44 @@ name = "zeroize" 
version = "1.7.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"



[[package]]

name = "zip"

version = "0.6.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"

dependencies = [

 "byteorder",

 "crc32fast",

 "crossbeam-utils",

 "zstd",

]



[[package]]

name = "zstd"

version = "0.11.2+zstd.1.5.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"

dependencies = [

 "zstd-safe",

]



[[package]]

name = "zstd-safe"

version = "5.0.2+zstd.1.5.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"

dependencies = [

 "libc",

 "zstd-sys",

]



[[package]]

name = "zstd-sys"

version = "2.0.10+zstd.1.5.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"

dependencies = [

 "cc",

 "pkg-config",

]

pkgs/development/tools/ruff/default.nix

+26 −2
Original line number Diff line number Diff line
@@ -6,23 +6,26 @@ 
, darwin

, rust-jemalloc-sys

, ruff-lsp

, testers

, ruff

}:



rustPlatform.buildRustPackage rec {

  pname = "ruff";

  version = "0.4.8";

  version = "0.4.9";



  src = fetchFromGitHub {

    owner = "astral-sh";

    repo = "ruff";

    rev = "refs/tags/v${version}";

    hash = "sha256-XuAJ65R80+IntWBGikG1cxAH8Tr3mnwQvSxeKFQj2ac=";

    hash = "sha256-40ZXD52d/kZNkSZ64H/s/OiiU99IiblGfYa4KmU8xD4=";

  };



  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ=";

      "salsa-2022-0.1.0" = "sha256-mt+X1hO+5ZrCAgy6N4aArnixJ9GjY/KwM0uIMUSrDsg=";

    };

  };
@@ -41,6 +44,26 @@ rustPlatform.buildRustPackage rec { 
    export NO_COLOR=1

  '';



  # Failing for an unclear reason.

  # According to the maintainers, those tests are from an experimental crate that isn't actually

  # used by ruff currently and can thus be safely skipped.

  checkFlags = [

    "--skip=semantic::tests::expression_scope"

    "--skip=semantic::tests::reachability_trivial"

    "--skip=semantic::types::infer::tests::follow_import_to_class"

    "--skip=semantic::types::infer::tests::if_elif"

    "--skip=semantic::types::infer::tests::if_elif_else"

    "--skip=semantic::types::infer::tests::ifexpr_walrus"

    "--skip=semantic::types::infer::tests::ifexpr_walrus_2"

    "--skip=semantic::types::infer::tests::join_paths"

    "--skip=semantic::types::infer::tests::literal_int_arithmetic"

    "--skip=semantic::types::infer::tests::maybe_unbound"

    "--skip=semantic::types::infer::tests::narrow_none"

    "--skip=semantic::types::infer::tests::resolve_base_class_by_name"

    "--skip=semantic::types::infer::tests::resolve_module_member"

    "--skip=semantic::types::infer::tests::resolve_visible_def"

  ];



  postInstall = ''

    installShellCompletion --cmd ruff \

      --bash <($out/bin/ruff generate-shell-completion bash) \
@@ -50,6 +73,7 @@ rustPlatform.buildRustPackage rec { 


  passthru.tests = {

    inherit ruff-lsp;

    version = testers.testVersion { package = ruff; };

  };



  meta = {