From 6315747ac6cf661eb8d4f25c6d1fcbb9a0e54d07 Mon Sep 17 00:00:00 2001 From: Caleb Stanford Date: Thu, 16 Nov 2023 18:11:53 -0600 Subject: [PATCH] :package: cargo upgrade --- Cargo.lock | 718 +++++++++++++++++++----------- Cargo.toml | 52 +-- src/resolution/name_resolution.rs | 1 + 3 files changed, 476 insertions(+), 295 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bbbf7b3..4582afd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,9 +55,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -93,9 +93,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -107,12 +107,6 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" -[[package]] -name = "anymap" -version = "1.0.0-beta.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1f8f5a6f3d50d89e3797d7593a50f96bb2aaa20ca0cc7be1fb673232c91d72" - [[package]] name = "arc-swap" version = "1.6.0" @@ -207,7 +201,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "regex-automata", + "regex-automata 0.3.3", "serde", ] @@ -249,20 +243,23 @@ dependencies = [ [[package]] name = "cargo" -version = "0.73.1" +version = "0.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a6fe1f5394d14b81d2f3f605832a3ce35ed0bf120bc7ef437ce27fd4929c6a" +checksum = "244574fb9c19dfe9b9d11cd6398f718aca7d11fb4f0d46f22cd867876a6c4c56" dependencies = [ "anyhow", "base64", "bytesize", + "cargo-credential", + "cargo-credential-libsecret", + "cargo-credential-macos-keychain", + "cargo-credential-wincred", "cargo-platform", "cargo-util", "clap", "crates-io", "curl", "curl-sys", - "env_logger", "filetime", "flate2", "fwdansi", @@ -278,13 +275,12 @@ dependencies = [ "humantime", "ignore", "im-rc", - "indexmap 1.9.3", + "indexmap 2.0.0", "itertools 0.10.5", "jobserver", "lazycell", "libc", "libgit2-sys", - "log", "memchr", "opener", "os_info", @@ -306,8 +302,11 @@ dependencies = [ "tempfile", "termcolor", "time", - "toml", - "toml_edit", + "toml 0.7.8", + "toml_edit 0.19.15", + "tracing", + "tracing-subscriber", + "unicase", "unicode-width", "unicode-xid", "url", @@ -315,6 +314,52 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "cargo-credential" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626c6c87f7906515d241db80b2e35e6818ea771da38003dec873914d417f48b5" +dependencies = [ + "anyhow", + "libc", + "serde", + "serde_json", + "thiserror", + "time", + "windows-sys 0.48.0", +] + +[[package]] +name = "cargo-credential-libsecret" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbbb9372b45e669060bba532a7a78f7e05a5791d8450eceab93006d72a542ee4" +dependencies = [ + "anyhow", + "cargo-credential", + "libloading", +] + +[[package]] +name = "cargo-credential-macos-keychain" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a07e26e78213508bf6007c9187f48ef1c98584d912d8195496828f30b7e2796" +dependencies = [ + "cargo-credential", + "security-framework", +] + +[[package]] +name = "cargo-credential-wincred" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637491b9d0fe5350a839903742de909c01e8440b2eadb561177039cbd8f0c71" +dependencies = [ + "cargo-credential", + "windows-sys 0.48.0", +] + [[package]] name = "cargo-lock" version = "9.0.0" @@ -324,15 +369,15 @@ dependencies = [ "petgraph 0.6.4", "semver", "serde", - "toml", + "toml 0.7.8", "url", ] [[package]] name = "cargo-platform" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" dependencies = [ "serde", ] @@ -355,7 +400,7 @@ dependencies = [ "flate2", "home", "inquire", - "itertools 0.11.0", + "itertools 0.12.0", "log", "parse-display", "petgraph 0.6.4", @@ -381,15 +426,15 @@ dependencies = [ "syn 2.0.29", "tar", "threadpool", - "toml", + "toml 0.8.8", "walkdir", ] [[package]] name = "cargo-util" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd54c8b94a0c851d687924460637361c355afafa72d973fe8644499fbdee8fae" +checksum = "77042b5b585f701f1cfb4b6b12ebc02b9b0cefbc8dcce235906b6bf376d4245d" dependencies = [ "anyhow", "core-foundation", @@ -397,12 +442,12 @@ dependencies = [ "hex", "jobserver", "libc", - "log", - "miow", + "miow 0.6.0", "same-file", "sha2", "shell-escape", "tempfile", + "tracing", "walkdir", "windows-sys 0.48.0", ] @@ -423,12 +468,12 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.15.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" +checksum = "6ca592ad99e6a0fd4b95153406138b997cc26ccd3cd0aecdfd4fbdbf1519bd77" dependencies = [ "serde", - "toml", + "toml 0.8.8", ] [[package]] @@ -448,9 +493,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chalk-derive" -version = "0.92.0" +version = "0.93.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff5053a8a42dbff5279a82423946fc56dc1253b76cf211b2b3c14b3aad4e1281" +checksum = "264726159011fc7f22c23eb51f49021ece6e71bc358b96e7f2e842db0b14162b" dependencies = [ "proc-macro2", "quote", @@ -460,9 +505,9 @@ dependencies = [ [[package]] name = "chalk-ir" -version = "0.92.0" +version = "0.93.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a56de2146a8ed0fcd54f4bd50db852f1de4eac9e1efe568494f106c21b77d2a" +checksum = "d65c17407d4c756b8f7f84344acb0fb96364d0298822743219bb25769b6d00df" dependencies = [ "bitflags 1.3.2", "chalk-derive", @@ -471,9 +516,9 @@ dependencies = [ [[package]] name = "chalk-recursive" -version = "0.92.0" +version = "0.93.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc09e6e9531f3544989ef89b189e80fbc7ad9e2f73f1c5e03ddc9ffb0527463" +checksum = "80e2cf7b70bedaaf3a8cf3c93b6120c2bb65be89389124028e724d19e209686e" dependencies = [ "chalk-derive", "chalk-ir", @@ -484,9 +529,9 @@ dependencies = [ [[package]] name = "chalk-solve" -version = "0.92.0" +version = "0.93.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b392e02b4c81ec76d3748da839fc70a5539b83d27c9030668463d34d5110b860" +checksum = "afc67c548d3854f64e97e67dc5b7c88513425c5bfa347cff96b7992ae6379288" dependencies = [ "chalk-derive", "chalk-ir", @@ -513,20 +558,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.1" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.4.1" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstream", "anstyle", @@ -537,9 +581,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.0" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -549,9 +593,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clru" @@ -636,15 +680,15 @@ dependencies = [ [[package]] name = "crates-io" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876aa69b4afca5f2eb5e23daa3445930faf829bcb67075a20ffa884f11f8c57c" +checksum = "4bd35a7899c7804e2f8e305438d7b70a852c0424009f3ac29ca4f6733f2aec85" dependencies = [ - "anyhow", "curl", "percent-encoding", "serde", "serde_json", + "thiserror", "url", ] @@ -791,9 +835,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.64+curl-8.2.0" +version = "0.4.68+curl-8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f96069f0b1cb1241c838740659a771ef143363f52772a9ce1bd9c04c75eee0dc" +checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f" dependencies = [ "cc", "libc", @@ -802,7 +846,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -979,9 +1023,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -1041,14 +1085,14 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "filetime" -version = "0.2.19" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", - "windows-sys 0.42.0", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", ] [[package]] @@ -1065,9 +1109,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "libz-sys", @@ -1602,7 +1646,7 @@ dependencies = [ "gix-command", "gix-config-value", "parking_lot 0.12.1", - "rustix 0.38.4", + "rustix", "thiserror", ] @@ -1884,27 +1928,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hkalbasi-rustc-ap-rustc_abi" -version = "0.0.20221221" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adabaadad9aa7576f97af02241cdf5554d62fb3d51a84cb05d77ba28edd3013f" -dependencies = [ - "bitflags 1.3.2", - "hkalbasi-rustc-ap-rustc_index", - "tracing", -] - -[[package]] -name = "hkalbasi-rustc-ap-rustc_index" -version = "0.0.20221221" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4d3c48474e09afb0f5efbd6f758e05411699301a113c47d454d28ec7059d00e" -dependencies = [ - "arrayvec 0.7.4", - "smallvec", -] - [[package]] name = "hkdf" version = "0.12.3" @@ -2104,17 +2127,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "is-terminal" version = "0.4.9" @@ -2122,7 +2134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.4", + "rustix", "windows-sys 0.48.0", ] @@ -2137,9 +2149,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" dependencies = [ "either", ] @@ -2241,6 +2253,16 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "libnghttp2-sys" version = "0.1.7+1.45.0" @@ -2287,12 +2309,6 @@ dependencies = [ "text-size", ] -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "linux-raw-sys" version = "0.4.3" @@ -2315,6 +2331,15 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "maybe-async" version = "0.2.7" @@ -2395,6 +2420,15 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "miow" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "newline-converter" version = "0.2.2" @@ -2420,22 +2454,42 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "normpath" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "notify" -version = "5.1.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.3", "crossbeam-channel", "filetime", "fsevent-sys", "inotify", "kqueue", "libc", + "log", "mio", "walkdir", - "windows-sys 0.42.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", ] [[package]] @@ -2489,11 +2543,12 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opener" -version = "0.5.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "293c15678e37254c15bd2f092314abb4e51d7fdde05c2021279c12631b54f005" +checksum = "6c62dcb6174f9cb326eac248f07e955d5d559c272730b6c03e396b443b562788" dependencies = [ "bstr", + "normpath", "winapi", ] @@ -2546,6 +2601,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "p384" version = "0.13.0" @@ -2627,7 +2688,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "regex-syntax", + "regex-syntax 0.7.4", "structmeta", "syn 2.0.29", ] @@ -2780,9 +2841,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -2825,21 +2886,72 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "ra-ap-rustc_abi" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7082716cb2bbcd8b5f062fe950cbbc87f3aba022d6da4168db35af6732a7f15d" +dependencies = [ + "bitflags 1.3.2", + "ra-ap-rustc_index 0.18.0", + "tracing", +] + +[[package]] +name = "ra-ap-rustc_index" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643ca3609870b1778d9cd1f2a8e4ccb4af0f48f3637cc257a09494d087bd93dc" +dependencies = [ + "arrayvec 0.7.4", + "smallvec", +] + +[[package]] +name = "ra-ap-rustc_index" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e14b1fc835d6992b128a03a3f3a8365ba9f03e1c656a1670305f63f30d786d" +dependencies = [ + "arrayvec 0.7.4", + "smallvec", +] + [[package]] name = "ra-ap-rustc_lexer" -version = "0.1.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1c145702ed3f237918e512685185dc8a4d0edc3a5326c63d20361d8ba9b45b3" +checksum = "30ffd24f9ba4f1d25ff27ca1469b8d22a3bdfb12cf644fc8bfcb63121fa5da6b" dependencies = [ - "unic-emoji-char", + "unicode-properties", "unicode-xid", ] +[[package]] +name = "ra-ap-rustc_lexer" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1762abb25eb1e37c1823f62b5da0821bbcd870812318db084c9516c2f78d2dcd" +dependencies = [ + "unicode-properties", + "unicode-xid", +] + +[[package]] +name = "ra-ap-rustc_parse_format" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "207b5ac1a21d4926695e03b605ffb9f63d4968e0488e9197c04c512c37303aa7" +dependencies = [ + "ra-ap-rustc_index 0.14.0", + "ra-ap-rustc_lexer 0.14.0", +] + [[package]] name = "ra_ap_base_db" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d71fc8c713ffb677304e7d0b4489607df1aed30e20d96a95cee7a3415aa8e9" +checksum = "056defd9d211fd0ae1eee4ebee5cd2a526ecfc5f14c76af53fbb6aaf509776ef" dependencies = [ "la-arena", "ra_ap_cfg", @@ -2856,9 +2968,9 @@ dependencies = [ [[package]] name = "ra_ap_cfg" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c81a0fc52925057a5d48e3167a9797e373bbf9d13129232d0e4a812b997ffb4" +checksum = "0280f63539d943bf1ec5b5bfe3f759195150b1eddd840b22e975f8526c57ec5e" dependencies = [ "ra_ap_tt", "rustc-hash", @@ -2866,9 +2978,9 @@ dependencies = [ [[package]] name = "ra_ap_hir" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a0e40dc2a4a9127cf92f3310c469e05fdda1bedc74031921bf75edae60b112f" +checksum = "efbe4b9d5158803a4d203751a87e872b7c5cfa47b77d04f32422064167b3bc3b" dependencies = [ "arrayvec 0.7.4", "either", @@ -2890,11 +3002,10 @@ dependencies = [ [[package]] name = "ra_ap_hir_def" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "401d8e3bab39fa97f5032a9963d714fd629212d0f0bcd7775a2dc5bd816d86e2" +checksum = "0ff670f5a8e184541f3ef6b7cc2b9abcc852df613af284d6c227b456d077360c" dependencies = [ - "anymap", "arrayvec 0.7.4", "bitflags 2.3.3", "cov-mark", @@ -2903,8 +3014,6 @@ dependencies = [ "either", "fst", "hashbrown 0.12.3", - "hkalbasi-rustc-ap-rustc_abi", - "hkalbasi-rustc-ap-rustc_index", "indexmap 2.0.0", "itertools 0.10.5", "la-arena", @@ -2916,6 +3025,7 @@ dependencies = [ "ra_ap_limit", "ra_ap_mbe", "ra_ap_profile", + "ra_ap_rustc-dependencies", "ra_ap_stdx", "ra_ap_syntax", "ra_ap_tt", @@ -2927,9 +3037,9 @@ dependencies = [ [[package]] name = "ra_ap_hir_expand" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955c889265bfae6e8bf43b2aac42532d301ae750406d5e6e71b7af194c314f51" +checksum = "dc0110e3f31ee3182bb63f46209126c7739e6be5e35ccedb8f4491ffb3751921" dependencies = [ "cov-mark", "either", @@ -2953,9 +3063,9 @@ dependencies = [ [[package]] name = "ra_ap_hir_ty" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5d036114b01abd934e181d840e92033eb027a85b48797387418888789fbc11" +checksum = "427b7d9f459a9210241cdbb9138a1acf4ace76c2ac5d174c7bc8a5657a7eed4c" dependencies = [ "arrayvec 0.7.4", "bitflags 2.3.3", @@ -2966,7 +3076,6 @@ dependencies = [ "cov-mark", "either", "ena", - "hkalbasi-rustc-ap-rustc_index", "itertools 0.10.5", "la-arena", "nohash-hasher", @@ -2978,6 +3087,7 @@ dependencies = [ "ra_ap_intern", "ra_ap_limit", "ra_ap_profile", + "ra_ap_rustc-dependencies", "ra_ap_stdx", "ra_ap_syntax", "rustc-hash", @@ -2990,9 +3100,9 @@ dependencies = [ [[package]] name = "ra_ap_ide" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "484d5fa98c7c7c9662fb2da3144cfd7190372a34bc5fd0adc690087010202e0e" +checksum = "268063c41f240c0541801be09a0bdcc74ea20d2d88b2c5008f962719ac77d870" dependencies = [ "cov-mark", "crossbeam-channel", @@ -3023,9 +3133,9 @@ dependencies = [ [[package]] name = "ra_ap_ide_assists" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4dfb1a7bb94aa78ae7f3a4ccdaffbd90ae54b484c4547e9de3999c661b9698" +checksum = "802d39fd471efdf22f93ee612aa5857d811f8b87b23e7bad3c599525cd94bac0" dependencies = [ "cov-mark", "either", @@ -3041,9 +3151,9 @@ dependencies = [ [[package]] name = "ra_ap_ide_completion" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71aad9862967fe779d6b26b142d279304e59618383100974bf908281e128401f" +checksum = "f31fa9667d81a6bd7f5d908c6117123616ad3030892293d74c6acffae14c7fab" dependencies = [ "cov-mark", "itertools 0.10.5", @@ -3060,9 +3170,9 @@ dependencies = [ [[package]] name = "ra_ap_ide_db" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af0e19eb6754bebe251905f77a2b0144cca9d3f7b6759c57bd496877e5a51fa7" +checksum = "23308f4caf6ede7e1b99f41ad432eb4615d403b98a9365bf5bad8a2d60678afd" dependencies = [ "arrayvec 0.7.4", "cov-mark", @@ -3090,9 +3200,9 @@ dependencies = [ [[package]] name = "ra_ap_ide_diagnostics" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a157186d1db3540235eb94278635681b1b602afc63c2dc3ea295ad2b224338" +checksum = "93edba5fcad1ad232ecb24dc20f97d1e1c22ced1f1840ef72b3e19470504d179" dependencies = [ "cov-mark", "either", @@ -3110,9 +3220,9 @@ dependencies = [ [[package]] name = "ra_ap_ide_ssr" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc12c024791e4808fc4ea21c70bd44a245a2091dbf894f3c23e4b98e4af3ebbf" +checksum = "4441c80d87975ca9120d5f6efba3c904bb8022a95fabe1f394664bced88c40b2" dependencies = [ "cov-mark", "itertools 0.10.5", @@ -3128,28 +3238,27 @@ dependencies = [ [[package]] name = "ra_ap_intern" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7af132576f23b2b93c14e3aa41548130c2ded2fc10011f787824d7adc77b1ec" +checksum = "5f7b508c71c5d70010685c470fa1aa2a505ebd6135f340d17709f2851df48c22" dependencies = [ "dashmap", "hashbrown 0.12.3", - "once_cell", "rustc-hash", "triomphe", ] [[package]] name = "ra_ap_limit" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "214222a3ae5d1e947ea7e97d0c162016ce9e5ea815c732e63d6ff373d5a617e4" +checksum = "7d2d9ae3cbde442c55ceb4f3481f55dd03d745de663e542bb1e62e14ba174165" [[package]] name = "ra_ap_load-cargo" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "005c425ab3c16db80747edd4f26464e532002a1a40877f039364ada7d6e23356" +checksum = "16eb83798cda7933e4078e9a6b80e6ec920ba82a87c7533c8ffa620d684044c9" dependencies = [ "anyhow", "crossbeam-channel", @@ -3166,9 +3275,9 @@ dependencies = [ [[package]] name = "ra_ap_mbe" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0147f11aa3f2b48b781ba74162708bac77bc293ec74443b1c4a5395f7a0a7a83" +checksum = "d168e8cc5788d9b12202dc121c1d7a578ab00e39811e73988e764ef7acd33d2f" dependencies = [ "cov-mark", "ra_ap_parser", @@ -3182,26 +3291,26 @@ dependencies = [ [[package]] name = "ra_ap_parser" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342ee20844cf3411c48ae52aa69eedaf11bd99fd4b0361d3070a4267f900f5d6" +checksum = "88cbc36dd4f3931bdb1350f780709baf0a5ba0a1709f9e46235048b428957b35" dependencies = [ "drop_bomb", - "ra-ap-rustc_lexer", "ra_ap_limit", + "ra_ap_rustc-dependencies", ] [[package]] name = "ra_ap_paths" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882f7e15bcf2bcfa84b86bc5bd67abe263c39285160282d82989607fc46ad13c" +checksum = "353529b296f42d9f602d21cc7331202251622dc2bde90e1453f8eca5b4778a9c" [[package]] name = "ra_ap_proc_macro_api" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39347a580d44f6e4e3487d2bb43250561dc3950789b49351243a3933ccfae04c" +checksum = "c6caab4b3ecf63cc30b00de53286fd1aabe92ad905aa37508f2701d2b276dfed" dependencies = [ "memmap2", "object", @@ -3218,9 +3327,9 @@ dependencies = [ [[package]] name = "ra_ap_profile" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a65b2498cba0361254503ad7608526918e4667512357927f28447846f6f679d1" +checksum = "1d7521a5eed73e5421c8d0435c16a8c5e1bcbb02f5ae85cd40c2de2859ffb079" dependencies = [ "cfg-if", "countme", @@ -3233,9 +3342,9 @@ dependencies = [ [[package]] name = "ra_ap_project_model" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9c931b495cde600a7a5826e28eddcedb72075cae601efc9addb563a8936731" +checksum = "4a23e98b449471522a3236fec10ea8dac1c8e9252e77b057bd3560f35bbf7a7b" dependencies = [ "anyhow", "cargo_metadata", @@ -3255,34 +3364,46 @@ dependencies = [ "triomphe", ] +[[package]] +name = "ra_ap_rustc-dependencies" +version = "0.0.185" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abe767cb59d4e7a01e4038f79d89b5ef3e7fe3dc6e7d285bb3608842fd7b3a06" +dependencies = [ + "ra-ap-rustc_abi", + "ra-ap-rustc_index 0.18.0", + "ra-ap-rustc_lexer 0.18.0", + "ra-ap-rustc_parse_format", +] + [[package]] name = "ra_ap_stdx" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15ae533cd9946ffe3c27e303126c597e963641725bcd93232b646d781e7b5668" +checksum = "1926fe674aa4a86ca8646c8821865f298f217609d940ff155980b35ad6c22097" dependencies = [ "always-assert", "crossbeam-channel", "jod-thread", "libc", - "miow", + "miow 0.5.0", "winapi", ] [[package]] name = "ra_ap_syntax" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da79a0cccdf3d9c09ed06462d6e641ff680614a880e0b305193ff4deb4210047" +checksum = "fc76ea7f829744119a6154fc7d9c331049cf158e263adee2aed1d26c932f4cc7" dependencies = [ "cov-mark", "either", "indexmap 2.0.0", "itertools 0.10.5", "once_cell", - "ra-ap-rustc_lexer", "ra_ap_parser", "ra_ap_profile", + "ra_ap_rustc-dependencies", "ra_ap_stdx", "ra_ap_text_edit", "rowan", @@ -3293,9 +3414,9 @@ dependencies = [ [[package]] name = "ra_ap_test_utils" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9421ef9cead7f05d621976df1559046d179f7a2ff01ad25b41906dc0602f5910" +checksum = "940c7bbe4c6c3b1c24911dabbb97ea0b7cc73216d2ddd6ece15cb8332c690834" dependencies = [ "dissimilar", "ra_ap_profile", @@ -3306,9 +3427,9 @@ dependencies = [ [[package]] name = "ra_ap_text_edit" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d22e21f9d5d63f1ad4a9715d0bafbb7d3a0acecc5fb9f1821f9d557c3028bf0" +checksum = "226a60d15a7ab37b352bde632e6991cf34fb60890b879fa5f87e1e116403e139" dependencies = [ "itertools 0.10.5", "text-size", @@ -3316,18 +3437,18 @@ dependencies = [ [[package]] name = "ra_ap_toolchain" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea28a9969087461651eab9ab1edf3c48a705e1261fcdd868ef912c114da6b4e6" +checksum = "cc4f0431a6e2499f370dda1c85a8c116949a5b28b11ca943494851b79a81a8ca" dependencies = [ "home", ] [[package]] name = "ra_ap_tt" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03fc0ca501ebf2c0b27b4a2dc544a3cec3df15fab652ea12098605e9103affa3" +checksum = "4524c093aa919f819c1b2a3337a20cd7d134fcf030180d0643710e3344cca3fb" dependencies = [ "ra_ap_stdx", "smol_str", @@ -3335,9 +3456,9 @@ dependencies = [ [[package]] name = "ra_ap_vfs" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b343805de8c0856ef23f6d04cf2694331c942b2310945625c5983ee04ab5c2" +checksum = "7b7d5122e0b9cc4a820501a788fdee8afebf63b0ae6bdbab76f1cd008f71e6bd" dependencies = [ "fst", "indexmap 2.0.0", @@ -3349,9 +3470,9 @@ dependencies = [ [[package]] name = "ra_ap_vfs-notify" -version = "0.0.171" +version = "0.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5ce2f790162ff3e3b89f804cd6a59896cef0a22a97f7c89c4bb751c4efeeb6" +checksum = "8a122f792db5cd541fda96bfb67c7378374e96443970260febb396aa8069cb24" dependencies = [ "crossbeam-channel", "notify", @@ -3449,8 +3570,17 @@ checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax", + "regex-automata 0.3.3", + "regex-syntax 0.7.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", ] [[package]] @@ -3461,9 +3591,15 @@ checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.7.4", ] +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + [[package]] name = "regex-syntax" version = "0.7.4" @@ -3511,20 +3647,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - [[package]] name = "rustix" version = "0.38.4" @@ -3534,7 +3656,7 @@ dependencies = [ "bitflags 2.3.3", "errno", "libc", - "linux-raw-sys 0.4.3", + "linux-raw-sys", "windows-sys 0.48.0", ] @@ -3617,20 +3739,43 @@ dependencies = [ "zeroize", ] +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.188" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] @@ -3647,9 +3792,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", @@ -3667,9 +3812,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -3678,18 +3823,18 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] [[package]] name = "serde_with" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" +checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" dependencies = [ "base64", "chrono", @@ -3704,9 +3849,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" +checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" dependencies = [ "darling", "proc-macro2", @@ -3733,15 +3878,24 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", "digest", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "shell-escape" version = "0.1.5" @@ -3943,7 +4097,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix 0.38.4", + "rustix", "windows-sys 0.48.0", ] @@ -3958,11 +4112,11 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.37.23", + "rustix", "windows-sys 0.48.0", ] @@ -4063,30 +4217,55 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.21.0", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap 2.0.0", "serde", @@ -4125,6 +4304,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", ] [[package]] @@ -4145,47 +4354,6 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-emoji-char" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b07221e68897210270a38bde4babb655869637af0f69407f96053a34f76494d" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - [[package]] name = "unicase" version = "2.6.0" @@ -4222,6 +4390,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-properties" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f91c8b21fbbaa18853c3d0801c78f4fc94cdb976699bb03e832e75f7fd22f0" + [[package]] name = "unicode-segmentation" version = "1.10.1" @@ -4257,6 +4431,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" @@ -4301,9 +4481,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", diff --git a/Cargo.toml b/Cargo.toml index c1a3f7d..0041c8a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,42 +21,42 @@ codegen-units = 16 [dependencies] anyhow = "1.0.75" assert_cmd = "2.0.12" -cargo = "0.73.1" -cargo_toml = "0.15.3" +cargo = "0.74.0" +cargo_toml = "0.17.0" cargo-lock = { version = "9.0.0", features = ["dependency-tree"] } -clap = { version = "4.4.1", features = ["derive"] } +clap = { version = "4.4.8", features = ["derive"] } codespan-reporting = "0.11.1" colored = "2.0.4" curl = "0.4.44" -env_logger = "0.10.0" -flate2 = "1.0.27" +env_logger = "0.10.1" +flate2 = "1.0.28" inquire = "0.6.2" -itertools = {version = "0.11.0"} +itertools = {version = "0.12.0"} log = "0.4.20" petgraph = "0.6.4" -proc-macro2 = { version = "1.0.66", features = ["span-locations"] } +proc-macro2 = { version = "1.0.69", features = ["span-locations"] } quote = "1.0.33" -ra_ap_hir = "0.0.171" -ra_ap_hir_def = "0.0.171" -ra_ap_hir_expand = "0.0.171" -ra_ap_hir_ty = "0.0.171" -ra_ap_ide = "0.0.171" -ra_ap_ide_db = "0.0.171" -ra_ap_load-cargo = "0.0.171" -ra_ap_paths = "0.0.171" -ra_ap_project_model = "0.0.171" -ra_ap_syntax = "0.0.171" -ra_ap_vfs = "0.0.171" -ra_ap_cfg = "0.0.171" -serde = { version = "1.0.188", features = ["derive"] } -serde_json = "1.0.105" -serde_with = "3.3.0" -semver = "1.0.18" -sha2 = "0.10.7" +ra_ap_hir = "0.0.185" +ra_ap_hir_def = "0.0.185" +ra_ap_hir_expand = "0.0.185" +ra_ap_hir_ty = "0.0.185" +ra_ap_ide = "0.0.185" +ra_ap_ide_db = "0.0.185" +ra_ap_load-cargo = "0.0.185" +ra_ap_paths = "0.0.185" +ra_ap_project_model = "0.0.185" +ra_ap_syntax = "0.0.185" +ra_ap_vfs = "0.0.185" +ra_ap_cfg = "0.0.185" +serde = { version = "1.0.192", features = ["derive"] } +serde_json = "1.0.108" +serde_with = "3.4.0" +semver = "1.0.20" +sha2 = "0.10.8" syn = { version = "2.0", features = ["full", "extra-traits"] } tar = "0.4.40" -toml = "0.7.6" -walkdir = "2.3.3" +toml = "0.8.8" +walkdir = "2.4.0" parse-display = "0.8.2" home = "0.5.5" csv = "1.3.0" diff --git a/src/resolution/name_resolution.rs b/src/resolution/name_resolution.rs index 955a4f5..0b389bf 100644 --- a/src/resolution/name_resolution.rs +++ b/src/resolution/name_resolution.rs @@ -79,6 +79,7 @@ impl Resolver { extra_env, invocation_strategy, invocation_location, + target_dir: None, } }