Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #12681 - lnicola:bump-deps, r=lnicola
Bump deps
26 files changed, 178 insertions, 170 deletions
diff --git a/Cargo.lock b/Cargo.lock index 22292cdcc6..69e27d2e81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -37,9 +37,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" +checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" [[package]] name = "anymap" @@ -49,9 +49,9 @@ checksum = "8f1f8f5a6f3d50d89e3797d7593a50f96bb2aaa20ca0cc7be1fb673232c91d72" [[package]] name = "arbitrary" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c38b6b6b79f671c25e1a3e785b7b82d7562ffc9cd3efdc98627e5668a2472490" +checksum = "5a7924531f38b1970ff630f03eb20a2fde69db5c590c93b0f3482e95dcc5fd60" [[package]] name = "arrayvec" @@ -87,7 +87,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.28.4", "rustc-demangle", ] @@ -132,9 +132,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.14.2" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" +checksum = "3abb7553d5b9b8421c6de7cb02606ff15e0c6eea7d8eadd75ef013fd636bec36" dependencies = [ "camino", "cargo-platform", @@ -171,9 +171,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chalk-derive" -version = "0.82.0" +version = "0.83.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee9cd790d543c29ce953abcb28d54b9fbaf9c4033bfd3024de99b1aa0f3c3ada" +checksum = "83553c2ef7717e58aecdf42dd9e3c876229f5a1f35a16435b5ddc4addef81827" dependencies = [ "proc-macro2", "quote", @@ -183,9 +183,9 @@ dependencies = [ [[package]] name = "chalk-ir" -version = "0.82.0" +version = "0.83.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dddf2c11f9de666c08c7591eb113efcdc740bd8ac602915475b045bcbe7f27a5" +checksum = "2dd42107d579d8ec2a5af20a8de62a37524a67bf6a4c0ff08a950068f0bfea91" dependencies = [ "bitflags", "chalk-derive", @@ -194,9 +194,9 @@ dependencies = [ [[package]] name = "chalk-recursive" -version = "0.82.0" +version = "0.83.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a60d5b35598702963ffd145b8bfa0d8d8ae9da3a731e4e0814aa21541b85c2d5" +checksum = "c444031541a76c13c145e76d91f1548e9feb2240e7f0c3e77879ceb694994f2d" dependencies = [ "chalk-derive", "chalk-ir", @@ -207,9 +207,9 @@ dependencies = [ [[package]] name = "chalk-solve" -version = "0.82.0" +version = "0.83.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d99da4fa3b224c07f6c2506e6905bca9d6aad665f11d25364e6818a7ea149215" +checksum = "c76f2db19c5e8a3d42340cf5b4d90b8c218750536fca35e2bb285ab6653c0bc8" dependencies = [ "chalk-derive", "chalk-ir", @@ -249,9 +249,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" +checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" dependencies = [ "cfg-if", "crossbeam-utils", @@ -270,26 +270,26 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" +checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "lazy_static", "memoffset", + "once_cell", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83" dependencies = [ "cfg-if", - "lazy_static", + "once_cell", ] [[package]] @@ -299,16 +299,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f" dependencies = [ "cfg-if", - "hashbrown 0.12.1", + "hashbrown", "lock_api", "parking_lot_core 0.9.3", ] [[package]] name = "derive_arbitrary" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98e23c06c035dac87bd802d98f368df73a7f2cb05a66ffbd1f377e821fac4af9" +checksum = "c9a577516173adb681466d517d39bd468293bc2c2a16439375ef0f35bba45f3d" dependencies = [ "proc-macro2", "quote", @@ -335,9 +335,9 @@ checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" [[package]] name = "either" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" [[package]] name = "ena" @@ -360,14 +360,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" +checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" dependencies = [ "cfg-if", "libc", "redox_syscall", - "winapi", + "windows-sys 0.36.1", ] [[package]] @@ -440,12 +440,6 @@ checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" [[package]] name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" - -[[package]] -name = "hashbrown" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" @@ -504,7 +498,7 @@ dependencies = [ "either", "expect-test", "fst", - "hashbrown 0.12.1", + "hashbrown", "hir-expand", "indexmap", "itertools", @@ -531,7 +525,7 @@ dependencies = [ "cov-mark", "either", "expect-test", - "hashbrown 0.12.1", + "hashbrown", "itertools", "la-arena", "limit", @@ -726,12 +720,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.2" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown 0.11.2", + "hashbrown", ] [[package]] @@ -960,9 +954,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" +checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" dependencies = [ "libc", "log", @@ -1017,6 +1011,15 @@ dependencies = [ ] [[package]] +name = "object" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +dependencies = [ + "memchr", +] + +[[package]] name = "once_cell" version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1143,7 +1146,7 @@ name = "proc-macro-api" version = "0.0.0" dependencies = [ "memmap2", - "object", + "object 0.29.0", "paths", "profile", "serde", @@ -1162,7 +1165,7 @@ dependencies = [ "libloading", "mbe", "memmap2", - "object", + "object 0.29.0", "paths", "proc-macro-api", "proc-macro-test", @@ -1184,9 +1187,9 @@ version = "0.0.0" [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ "unicode-ident", ] @@ -1239,18 +1242,18 @@ dependencies = [ [[package]] name = "pulldown-cmark-to-cmark" -version = "10.0.1" +version = "10.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eafb76310f7dc895b5d83d24f2a00e244fc8a68ef94f4257eb4060984d0385f" +checksum = "c1353ac408192fa925228d3e60ff746167d03f4f7e54835d78ef79e08225d913" dependencies = [ "pulldown-cmark", ] [[package]] name = "quote" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] @@ -1319,7 +1322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce1f383129e417a6265b16ed78e6e9307748f0863b2ba75f78ff14717db5b017" dependencies = [ "countme", - "hashbrown 0.12.1", + "hashbrown", "memoffset", "rustc-hash", "text-size", @@ -1457,27 +1460,27 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "semver" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41d061efea015927ac527063765e73601444cdc344ba855bc7bd44578b25e1c" +checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.137" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +checksum = "1578c6245786b9d168c5447eeacfb96856573ca56c9d68fdcf394be134882a47" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.137" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +checksum = "023e9b1467aef8a10fb88f25611870ada9800ef7e22afce356bb0d2387b6f27c" dependencies = [ "proc-macro2", "quote", @@ -1486,9 +1489,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" dependencies = [ "indexmap", "itoa", @@ -1518,9 +1521,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" [[package]] name = "smol_str" @@ -1557,9 +1560,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.96" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", @@ -1659,9 +1662,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.5.0+5.3.0" +version = "0.5.1+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeab4310214fe0226df8bfeb893a291a58b19682e8a07e1e1d4483ad4200d315" +checksum = "931e876f91fed0827f863a2d153897790da0b24d882c721a79cb3beb0b903261" dependencies = [ "cc", "fs_extra", @@ -1714,9 +1717,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" +checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" dependencies = [ "proc-macro2", "quote", @@ -1725,9 +1728,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709595b8878a4965ce5e87ebf880a7d39c9afc6837721b21a5a816a8117d921" +checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" dependencies = [ "once_cell", "valuable", @@ -1746,12 +1749,12 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.11" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" +checksum = "3a713421342a5a666b7577783721d3117f1b69a393df803ee17bb73b1e122a59" dependencies = [ - "lazy_static", "matchers", + "once_cell", "regex", "sharded-slab", "thread_local", @@ -1810,15 +1813,15 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" dependencies = [ "tinyvec", ] diff --git a/crates/flycheck/Cargo.toml b/crates/flycheck/Cargo.toml index ff1028cf62..d3d180ece5 100644 --- a/crates/flycheck/Cargo.toml +++ b/crates/flycheck/Cargo.toml @@ -10,9 +10,9 @@ rust-version = "1.57" doctest = false [dependencies] -crossbeam-channel = "0.5.4" +crossbeam-channel = "0.5.5" tracing = "0.1.35" -cargo_metadata = "0.14.2" +cargo_metadata = "0.15.0" serde = { version = "1.0.137", features = ["derive"] } serde_json = "1.0.81" jod-thread = "0.1.2" diff --git a/crates/hir-def/Cargo.toml b/crates/hir-def/Cargo.toml index cc276d402b..35a18e4beb 100644 --- a/crates/hir-def/Cargo.toml +++ b/crates/hir-def/Cargo.toml @@ -17,15 +17,15 @@ cov-mark = "2.0.0-pre.1" # We need to freeze the version of the crate, as the raw-api feature is considered unstable dashmap = { version = "=5.3.4", features = ["raw-api"] } drop_bomb = "0.1.5" -either = "1.6.1" +either = "1.7.0" fst = { version = "0.4.7", default-features = false } hashbrown = { version = "0.12.1", default-features = false } -indexmap = "1.8.2" +indexmap = "1.9.1" itertools = "0.10.3" la-arena = { version = "0.3.0", path = "../../lib/la-arena" } once_cell = "1.12.0" rustc-hash = "1.1.0" -smallvec = "1.8.0" +smallvec = "1.9.0" tracing = "0.1.35" stdx = { path = "../stdx", version = "0.0.0" } diff --git a/crates/hir-expand/Cargo.toml b/crates/hir-expand/Cargo.toml index 0e6fad1610..453afa6e2f 100644 --- a/crates/hir-expand/Cargo.toml +++ b/crates/hir-expand/Cargo.toml @@ -12,7 +12,7 @@ doctest = false [dependencies] cov-mark = "2.0.0-pre.1" tracing = "0.1.35" -either = "1.6.1" +either = "1.7.0" rustc-hash = "1.1.0" la-arena = { version = "0.3.0", path = "../../lib/la-arena" } itertools = "0.10.3" diff --git a/crates/hir-ty/Cargo.toml b/crates/hir-ty/Cargo.toml index 4c5bd2c89c..d359cb0ed1 100644 --- a/crates/hir-ty/Cargo.toml +++ b/crates/hir-ty/Cargo.toml @@ -13,14 +13,14 @@ doctest = false cov-mark = "2.0.0-pre.1" itertools = "0.10.3" arrayvec = "0.7.2" -smallvec = "1.8.0" +smallvec = "1.9.0" ena = "0.14.0" tracing = "0.1.35" rustc-hash = "1.1.0" scoped-tls = "1.0.0" -chalk-solve = { version = "0.82.0", default-features = false } -chalk-ir = "0.82.0" -chalk-recursive = { version = "0.82.0", default-features = false } +chalk-solve = { version = "0.83.0", default-features = false } +chalk-ir = "0.83.0" +chalk-recursive = { version = "0.83.0", default-features = false } la-arena = { version = "0.3.0", path = "../../lib/la-arena" } once_cell = "1.12.0" typed-arena = "2.0.1" @@ -37,7 +37,7 @@ limit = { path = "../limit", version = "0.0.0" } test-utils = { path = "../test-utils" } expect-test = "1.3.0" tracing = "0.1.35" -tracing-subscriber = { version = "0.3.11", default-features = false, features = [ +tracing-subscriber = { version = "0.3.14", default-features = false, features = [ "env-filter", "registry", ] } diff --git a/crates/hir-ty/src/builder.rs b/crates/hir-ty/src/builder.rs index 8c47e9ce1c..23587cc6d0 100644 --- a/crates/hir-ty/src/builder.rs +++ b/crates/hir-ty/src/builder.rs @@ -4,7 +4,7 @@ use std::iter; use chalk_ir::{ cast::{Cast, CastTo, Caster}, - fold::Fold, + fold::TypeFoldable, interner::HasInterner, AdtId, BoundVar, DebruijnIndex, Scalar, }; @@ -276,7 +276,7 @@ impl TyBuilder<TypeAliasId> { } } -impl<T: HasInterner<Interner = Interner> + Fold<Interner>> TyBuilder<Binders<T>> { +impl<T: HasInterner<Interner = Interner> + TypeFoldable<Interner>> TyBuilder<Binders<T>> { fn subst_binders(b: Binders<T>) -> Self { let param_kinds = b .binders @@ -290,7 +290,7 @@ impl<T: HasInterner<Interner = Interner> + Fold<Interner>> TyBuilder<Binders<T>> TyBuilder::new(b, param_kinds) } - pub fn build(self) -> <T as Fold<Interner>>::Result { + pub fn build(self) -> T { let (b, subst) = self.build_internal(); b.substitute(Interner, &subst) } diff --git a/crates/hir-ty/src/infer/unify.rs b/crates/hir-ty/src/infer/unify.rs index 84ca1660af..014109f03d 100644 --- a/crates/hir-ty/src/infer/unify.rs +++ b/crates/hir-ty/src/infer/unify.rs @@ -3,8 +3,8 @@ use std::{fmt, mem, sync::Arc}; use chalk_ir::{ - cast::Cast, fold::Fold, interner::HasInterner, zip::Zip, CanonicalVarKind, FloatTy, IntTy, - NoSolution, TyVariableKind, UniverseIndex, + cast::Cast, fold::TypeFoldable, interner::HasInterner, zip::Zip, CanonicalVarKind, FloatTy, + IntTy, NoSolution, TyVariableKind, UniverseIndex, }; use chalk_solve::infer::ParameterEnaVariableExt; use ena::unify::UnifyKey; @@ -20,12 +20,12 @@ use crate::{ }; impl<'a> InferenceContext<'a> { - pub(super) fn canonicalize<T: Fold<Interner> + HasInterner<Interner = Interner>>( + pub(super) fn canonicalize<T: TypeFoldable<Interner> + HasInterner<Interner = Interner>>( &mut self, t: T, - ) -> Canonicalized<T::Result> + ) -> Canonicalized<T> where - T::Result: HasInterner<Interner = Interner>, + T: HasInterner<Interner = Interner>, { self.table.canonicalize(t) } @@ -200,12 +200,12 @@ impl<'a> InferenceTable<'a> { .intern(Interner) } - pub(crate) fn canonicalize<T: Fold<Interner> + HasInterner<Interner = Interner>>( + pub(crate) fn canonicalize<T: TypeFoldable<Interner> + HasInterner<Interner = Interner>>( &mut self, t: T, - ) -> Canonicalized<T::Result> + ) -> Canonicalized<T> where - T::Result: HasInterner<Interner = Interner>, + T: HasInterner<Interner = Interner>, { // try to resolve obligations before canonicalizing, since this might // result in new knowledge about variables @@ -292,9 +292,9 @@ impl<'a> InferenceTable<'a> { &mut self, t: T, fallback: &dyn Fn(InferenceVar, VariableKind, GenericArg, DebruijnIndex) -> GenericArg, - ) -> T::Result + ) -> T where - T: HasInterner<Interner = Interner> + Fold<Interner>, + T: HasInterner<Interner = Interner> + TypeFoldable<Interner>, { self.resolve_with_fallback_inner(&mut Vec::new(), t, &fallback) } @@ -310,9 +310,9 @@ impl<'a> InferenceTable<'a> { ) } - pub(crate) fn instantiate_canonical<T>(&mut self, canonical: Canonical<T>) -> T::Result + pub(crate) fn instantiate_canonical<T>(&mut self, canonical: Canonical<T>) -> T where - T: HasInterner<Interner = Interner> + Fold<Interner> + std::fmt::Debug, + T: HasInterner<Interner = Interner> + TypeFoldable<Interner> + std::fmt::Debug, { let subst = self.fresh_subst(canonical.binders.as_slice(Interner)); subst.apply(canonical.value, Interner) @@ -323,9 +323,9 @@ impl<'a> InferenceTable<'a> { var_stack: &mut Vec<InferenceVar>, t: T, fallback: &dyn Fn(InferenceVar, VariableKind, GenericArg, DebruijnIndex) -> GenericArg, - ) -> T::Result + ) -> T where - T: HasInterner<Interner = Interner> + Fold<Interner>, + T: HasInterner<Interner = Interner> + TypeFoldable<Interner>, { t.fold_with( &mut resolve::Resolver { table: self, var_stack, fallback }, @@ -334,9 +334,9 @@ impl<'a> InferenceTable<'a> { .expect("fold failed unexpectedly") } - pub(crate) fn resolve_completely<T>(&mut self, t: T) -> T::Result + pub(crate) fn resolve_completely<T>(&mut self, t: T) -> T where - T: HasInterner<Interner = Interner> + Fold<Interner>, + T: HasInterner<Interner = Interner> + TypeFoldable<Interner>, { self.resolve_with_fallback(t, &|_, _, d, _| d) } @@ -447,19 +447,19 @@ impl<'a> InferenceTable<'a> { } } - pub(crate) fn fudge_inference<T: Fold<Interner>>( + pub(crate) fn fudge_inference<T: TypeFoldable<Interner>>( &mut self, f: impl FnOnce(&mut Self) -> T, - ) -> T::Result { - use chalk_ir::fold::Folder; + ) -> T { + use chalk_ir::fold::TypeFolder; struct VarFudger<'a, 'b> { table: &'a mut InferenceTable<'b>, highest_known_var: InferenceVar, } - impl<'a, 'b> Folder<Interner> for VarFudger<'a, 'b> { + impl<'a, 'b> TypeFolder<Interner> for VarFudger<'a, 'b> { type Error = NoSolution; - fn as_dyn(&mut self) -> &mut dyn Folder<Interner, Error = Self::Error> { + fn as_dyn(&mut self) -> &mut dyn TypeFolder<Interner, Error = Self::Error> { self } @@ -635,7 +635,7 @@ mod resolve { }; use chalk_ir::{ cast::Cast, - fold::{Fold, Folder}, + fold::{TypeFoldable, TypeFolder}, Fallible, NoSolution, }; use hir_def::type_ref::ConstScalar; @@ -645,13 +645,13 @@ mod resolve { pub(super) var_stack: &'a mut Vec<InferenceVar>, pub(super) fallback: F, } - impl<'a, 'b, 'i, F> Folder<Interner> for Resolver<'a, 'b, F> + impl<'a, 'b, 'i, F> TypeFolder<Interner> for Resolver<'a, 'b, F> where F: Fn(InferenceVar, VariableKind, GenericArg, DebruijnIndex) -> GenericArg + 'i, { type Error = NoSolution; - fn as_dyn(&mut self) -> &mut dyn Folder<Interner, Error = Self::Error> { + fn as_dyn(&mut self) -> &mut dyn TypeFolder<Interner, Error = Self::Error> { self } diff --git a/crates/hir-ty/src/lib.rs b/crates/hir-ty/src/lib.rs index 15bcbda25d..5abbee8971 100644 --- a/crates/hir-ty/src/lib.rs +++ b/crates/hir-ty/src/lib.rs @@ -33,7 +33,7 @@ mod test_db; use std::sync::Arc; use chalk_ir::{ - fold::{Fold, Shift}, + fold::{Shift, TypeFoldable}, interner::HasInterner, NoSolution, }; @@ -136,7 +136,7 @@ pub fn param_idx(db: &dyn HirDatabase, id: TypeOrConstParamId) -> Option<usize> pub(crate) fn wrap_empty_binders<T>(value: T) -> Binders<T> where - T: Fold<Interner, Result = T> + HasInterner<Interner = Interner>, + T: TypeFoldable<Interner> + HasInterner<Interner = Interner>, { Binders::empty(Interner, value.shifted_in_from(Interner, DebruijnIndex::ONE)) } @@ -264,14 +264,12 @@ impl CallableSig { } } -impl Fold<Interner> for CallableSig { - type Result = CallableSig; - +impl TypeFoldable<Interner> for CallableSig { fn fold_with<E>( self, - folder: &mut dyn chalk_ir::fold::Folder<Interner, Error = E>, + folder: &mut dyn chalk_ir::fold::TypeFolder<Interner, Error = E>, outer_binder: DebruijnIndex, - ) -> Result<Self::Result, E> { + ) -> Result<Self, E> { let vec = self.params_and_return.to_vec(); let folded = vec.fold_with(folder, outer_binder)?; Ok(CallableSig { params_and_return: folded.into(), is_varargs: self.is_varargs }) @@ -300,22 +298,22 @@ pub fn static_lifetime() -> Lifetime { LifetimeData::Static.intern(Interner) } -pub(crate) fn fold_free_vars<T: HasInterner<Interner = Interner> + Fold<Interner>>( +pub(crate) fn fold_free_vars<T: HasInterner<Interner = Interner> + TypeFoldable<Interner>>( t: T, for_ty: impl FnMut(BoundVar, DebruijnIndex) -> Ty, for_const: impl FnMut(Ty, BoundVar, DebruijnIndex) -> Const, -) -> T::Result { - use chalk_ir::{fold::Folder, Fallible}; +) -> T { + use chalk_ir::{fold::TypeFolder, Fallible}; struct FreeVarFolder<F1, F2>(F1, F2); impl< 'i, F1: FnMut(BoundVar, DebruijnIndex) -> Ty + 'i, F2: FnMut(Ty, BoundVar, DebruijnIndex) -> Const + 'i, - > Folder<Interner> for FreeVarFolder<F1, F2> + > TypeFolder<Interner> for FreeVarFolder<F1, F2> { type Error = NoSolution; - fn as_dyn(&mut self) -> &mut dyn Folder<Interner, Error = Self::Error> { + fn as_dyn(&mut self) -> &mut dyn TypeFolder<Interner, Error = Self::Error> { self } @@ -344,11 +342,11 @@ pub(crate) fn fold_free_vars<T: HasInterner<Interner = Interner> + Fold<Interner .expect("fold failed unexpectedly") } -pub(crate) fn fold_tys<T: HasInterner<Interner = Interner> + Fold<Interner>>( +pub(crate) fn fold_tys<T: HasInterner<Interner = Interner> + TypeFoldable<Interner>>( t: T, mut for_ty: impl FnMut(Ty, DebruijnIndex) -> Ty, binders: DebruijnIndex, -) -> T::Result { +) -> T { fold_tys_and_consts( t, |x, d| match x { @@ -359,22 +357,22 @@ pub(crate) fn fold_tys<T: HasInterner<Interner = Interner> + Fold<Interner>>( ) } -pub(crate) fn fold_tys_and_consts<T: HasInterner<Interner = Interner> + Fold<Interner>>( +pub(crate) fn fold_tys_and_consts<T: HasInterner<Interner = Interner> + TypeFoldable<Interner>>( t: T, f: impl FnMut(Either<Ty, Const>, DebruijnIndex) -> Either<Ty, Const>, binders: DebruijnIndex, -) -> T::Result { +) -> T { use chalk_ir::{ - fold::{Folder, SuperFold}, + fold::{TypeFolder, TypeSuperFoldable}, Fallible, }; struct TyFolder<F>(F); - impl<'i, F: FnMut(Either<Ty, Const>, DebruijnIndex) -> Either<Ty, Const> + 'i> Folder<Interner> - for TyFolder<F> + impl<'i, F: FnMut(Either<Ty, Const>, DebruijnIndex) -> Either<Ty, Const> + 'i> + TypeFolder<Interner> for TyFolder<F> { type Error = NoSolution; - fn as_dyn(&mut self) -> &mut dyn Folder<Interner, Error = Self::Error> { + fn as_dyn(&mut self) -> &mut dyn TypeFolder<Interner, Error = Self::Error> { self } @@ -397,22 +395,22 @@ pub(crate) fn fold_tys_and_consts<T: HasInterner<Interner = Interner> + Fold<Int /// 'Canonicalizes' the `t` by replacing any errors with new variables. Also /// ensures there are no unbound variables or inference variables anywhere in /// the `t`. -pub fn replace_errors_with_variables<T>(t: &T) -> Canonical<T::Result> +pub fn replace_errors_with_variables<T>(t: &T) -> Canonical<T> where - T: HasInterner<Interner = Interner> + Fold<Interner> + Clone, - T::Result: HasInterner<Interner = Interner>, + T: HasInterner<Interner = Interner> + TypeFoldable<Interner> + Clone, + T: HasInterner<Interner = Interner>, { use chalk_ir::{ - fold::{Folder, SuperFold}, + fold::{TypeFolder, TypeSuperFoldable}, Fallible, }; struct ErrorReplacer { vars: usize, } - impl Folder<Interner> for ErrorReplacer { + impl TypeFolder<Interner> for ErrorReplacer { type Error = NoSolution; - fn as_dyn(&mut self) -> &mut dyn Folder<Interner, Error = Self::Error> { + fn as_dyn(&mut self) -> &mut dyn TypeFolder<Interner, Error = Self::Error> { self } diff --git a/crates/hir-ty/src/lower.rs b/crates/hir-ty/src/lower.rs index adee8cf958..f9747f3b34 100644 --- a/crates/hir-ty/src/lower.rs +++ b/crates/hir-ty/src/lower.rs @@ -12,7 +12,9 @@ use std::{ }; use base_db::CrateId; -use chalk_ir::{cast::Cast, fold::Fold, fold::Shift, interner::HasInterner, Mutability, Safety}; +use chalk_ir::{ + cast::Cast, fold::Shift, fold::TypeFoldable, interner::HasInterner, Mutability, Safety, +}; use hir_def::{ adt::StructKind, @@ -1751,10 +1753,10 @@ pub(crate) fn const_or_path_to_chalk( /// This replaces any 'free' Bound vars in `s` (i.e. those with indices past /// num_vars_to_keep) by `TyKind::Unknown`. -fn fallback_bound_vars<T: Fold<Interner> + HasInterner<Interner = Interner>>( +fn fallback_bound_vars<T: TypeFoldable<Interner> + HasInterner<Interner = Interner>>( s: T, num_vars_to_keep: usize, -) -> T::Result { +) -> T { crate::fold_free_vars( s, |bound, binders| { diff --git a/crates/hir/Cargo.toml b/crates/hir/Cargo.toml index 8f59d0dafe..8e6a2441b3 100644 --- a/crates/hir/Cargo.toml +++ b/crates/hir/Cargo.toml @@ -11,10 +11,10 @@ doctest = false [dependencies] rustc-hash = "1.1.0" -either = "1.6.1" +either = "1.7.0" arrayvec = "0.7.2" itertools = "0.10.3" -smallvec = "1.8.0" +smallvec = "1.9.0" once_cell = "1.12.0" stdx = { path = "../stdx", version = "0.0.0" } diff --git a/crates/ide-assists/Cargo.toml b/crates/ide-assists/Cargo.toml index 9e7c99f74e..bc3e9a3229 100644 --- a/crates/ide-assists/Cargo.toml +++ b/crates/ide-assists/Cargo.toml @@ -13,7 +13,7 @@ doctest = false cov-mark = "2.0.0-pre.1" itertools = "0.10.3" -either = "1.6.1" +either = "1.7.0" stdx = { path = "../stdx", version = "0.0.0" } syntax = { path = "../syntax", version = "0.0.0" } diff --git a/crates/ide-completion/Cargo.toml b/crates/ide-completion/Cargo.toml index 2dee2579eb..adca75c2a1 100644 --- a/crates/ide-completion/Cargo.toml +++ b/crates/ide-completion/Cargo.toml @@ -14,7 +14,7 @@ cov-mark = "2.0.0-pre.1" itertools = "0.10.3" once_cell = "1.12.0" -smallvec = "1.8.0" +smallvec = "1.9.0" stdx = { path = "../stdx", version = "0.0.0" } syntax = { path = "../syntax", version = "0.0.0" } diff --git a/crates/ide-db/Cargo.toml b/crates/ide-db/Cargo.toml index d22f87994f..e3ed054a0e 100644 --- a/crates/ide-db/Cargo.toml +++ b/crates/ide-db/Cargo.toml @@ -16,10 +16,10 @@ rayon = "1.5.3" fst = { version = "0.4.7", default-features = false } rustc-hash = "1.1.0" once_cell = "1.12.0" -either = "1.6.1" +either = "1.7.0" itertools = "0.10.3" arrayvec = "0.7.2" -indexmap = "1.8.2" +indexmap = "1.9.1" stdx = { path = "../stdx", version = "0.0.0" } parser = { path = "../parser", version = "0.0.0" } diff --git a/crates/ide-diagnostics/Cargo.toml b/crates/ide-diagnostics/Cargo.toml index f37e754fea..73093a23a9 100644 --- a/crates/ide-diagnostics/Cargo.toml +++ b/crates/ide-diagnostics/Cargo.toml @@ -14,7 +14,7 @@ cov-mark = "2.0.0-pre.1" itertools = "0.10.3" -either = "1.6.1" +either = "1.7.0" profile = { path = "../profile", version = "0.0.0" } stdx = { path = "../stdx", version = "0.0.0" } diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml index 64263161a9..a0e4278c7b 100644 --- a/crates/ide/Cargo.toml +++ b/crates/ide/Cargo.toml @@ -11,8 +11,8 @@ doctest = false [dependencies] cov-mark = "2.0.0-pre.1" -crossbeam-channel = "0.5.4" -either = "1.6.1" +crossbeam-channel = "0.5.5" +either = "1.7.0" itertools = "0.10.3" tracing = "0.1.35" oorandom = "11.1.3" diff --git a/crates/mbe/Cargo.toml b/crates/mbe/Cargo.toml index 66581d6def..5ff3448a19 100644 --- a/crates/mbe/Cargo.toml +++ b/crates/mbe/Cargo.toml @@ -12,7 +12,7 @@ doctest = false [dependencies] cov-mark = "2.0.0-pre.1" rustc-hash = "1.1.0" -smallvec = "1.8.0" +smallvec = "1.9.0" tracing = "0.1.35" syntax = { path = "../syntax", version = "0.0.0" } diff --git a/crates/proc-macro-api/Cargo.toml b/crates/proc-macro-api/Cargo.toml index 88bbaee5a8..85a1c13fe7 100644 --- a/crates/proc-macro-api/Cargo.toml +++ b/crates/proc-macro-api/Cargo.toml @@ -10,7 +10,7 @@ rust-version = "1.57" doctest = false [dependencies] -object = { version = "0.28.4", default-features = false, features = [ +object = { version = "0.29.0", default-features = false, features = [ "std", "read_core", "elf", diff --git a/crates/proc-macro-srv/Cargo.toml b/crates/proc-macro-srv/Cargo.toml index e7000a259f..ec2d41170a 100644 --- a/crates/proc-macro-srv/Cargo.toml +++ b/crates/proc-macro-srv/Cargo.toml @@ -10,7 +10,7 @@ rust-version = "1.57" doctest = false [dependencies] -object = { version = "0.28.4", default-features = false, features = [ +object = { version = "0.29.0", default-features = false, features = [ "std", "read_core", "elf", diff --git a/crates/proc-macro-test/Cargo.toml b/crates/proc-macro-test/Cargo.toml index 872b2a99d8..684477191b 100644 --- a/crates/proc-macro-test/Cargo.toml +++ b/crates/proc-macro-test/Cargo.toml @@ -12,4 +12,4 @@ doctest = false [build-dependencies] proc-macro-test-impl = { path = "imp", version = "0.0.0" } toolchain = { path = "../toolchain", version = "0.0.0" } -cargo_metadata = "0.14.2" +cargo_metadata = "0.15.0" diff --git a/crates/project-model/Cargo.toml b/crates/project-model/Cargo.toml index 35465d0861..84b239b3e2 100644 --- a/crates/project-model/Cargo.toml +++ b/crates/project-model/Cargo.toml @@ -12,7 +12,7 @@ doctest = false [dependencies] tracing = "0.1.35" rustc-hash = "1.1.0" -cargo_metadata = "0.14.2" +cargo_metadata = "0.15.0" semver = "1.0.10" serde = { version = "1.0.137", features = ["derive"] } serde_json = "1.0.81" diff --git a/crates/project-model/src/cargo_workspace.rs b/crates/project-model/src/cargo_workspace.rs index 76ef44e147..597880c2ca 100644 --- a/crates/project-model/src/cargo_workspace.rs +++ b/crates/project-model/src/cargo_workspace.rs @@ -318,10 +318,15 @@ impl CargoWorkspace { .. } = meta_pkg; let meta = from_value::<PackageMetadata>(metadata.clone()).unwrap_or_default(); - let edition = edition.parse::<Edition>().unwrap_or_else(|err| { - tracing::error!("Failed to parse edition {}", err); - Edition::CURRENT - }); + let edition = match edition { + cargo_metadata::Edition::E2015 => Edition::Edition2015, + cargo_metadata::Edition::E2018 => Edition::Edition2018, + cargo_metadata::Edition::E2021 => Edition::Edition2021, + _ => { + tracing::error!("Unsupported edition `{:?}`", edition); + Edition::CURRENT + } + }; // We treat packages without source as "local" packages. That includes all members of // the current workspace, as well as any path dependency outside the workspace. let is_local = meta_pkg.source.is_none(); diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index 04c986f0f2..7e69bcbaf1 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml @@ -19,7 +19,7 @@ path = "src/bin/main.rs" [dependencies] anyhow = "1.0.57" -crossbeam-channel = "0.5.4" +crossbeam-channel = "0.5.5" dissimilar = "1.0.4" itertools = "0.10.3" lsp-types = { version = "0.93.0", features = ["proposed"] } @@ -35,7 +35,7 @@ num_cpus = "1.13.1" mimalloc = { version = "0.1.29", default-features = false, optional = true } lsp-server = { version = "0.6.0", path = "../../lib/lsp-server" } tracing = "0.1.35" -tracing-subscriber = { version = "0.3.11", default-features = false, features = [ +tracing-subscriber = { version = "0.3.14", default-features = false, features = [ "env-filter", "registry", "fmt", diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml index 1d1ca66ee6..dbecfdd218 100644 --- a/crates/syntax/Cargo.toml +++ b/crates/syntax/Cargo.toml @@ -17,7 +17,7 @@ rowan = "0.15.5" rustc_lexer = { version = "725.0.0", package = "rustc-ap-rustc_lexer" } rustc-hash = "1.1.0" once_cell = "1.12.0" -indexmap = "1.8.2" +indexmap = "1.9.1" smol_str = "0.1.23" stdx = { path = "../stdx", version = "0.0.0" } @@ -29,7 +29,7 @@ profile = { path = "../profile", version = "0.0.0" } rayon = "1.5.3" expect-test = "1.3.0" proc-macro2 = "1.0.39" -quote = "1.0.18" +quote = "1.0.20" ungrammar = "1.16.1" test-utils = { path = "../test-utils" } diff --git a/crates/vfs-notify/Cargo.toml b/crates/vfs-notify/Cargo.toml index 2b8e3318a9..9ee4415dca 100644 --- a/crates/vfs-notify/Cargo.toml +++ b/crates/vfs-notify/Cargo.toml @@ -13,7 +13,7 @@ doctest = false tracing = "0.1.35" jod-thread = "0.1.2" walkdir = "2.3.2" -crossbeam-channel = "0.5.4" +crossbeam-channel = "0.5.5" notify = "=5.0.0-pre.15" vfs = { path = "../vfs", version = "0.0.0" } diff --git a/crates/vfs/Cargo.toml b/crates/vfs/Cargo.toml index 38222476b5..c637734878 100644 --- a/crates/vfs/Cargo.toml +++ b/crates/vfs/Cargo.toml @@ -14,4 +14,4 @@ rustc-hash = "1.1.0" fst = "0.4.7" paths = { path = "../paths", version = "0.0.0" } -indexmap = "1.8.2" +indexmap = "1.9.1" diff --git a/lib/lsp-server/Cargo.toml b/lib/lsp-server/Cargo.toml index b2476df78d..615837b3ff 100644 --- a/lib/lsp-server/Cargo.toml +++ b/lib/lsp-server/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" log = "0.4.17" serde_json = "1.0.81" serde = { version = "1.0.137", features = ["derive"] } -crossbeam-channel = "0.5.4" +crossbeam-channel = "0.5.5" [dev-dependencies] lsp-types = "0.93.0" |