Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-17 02:08:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #7523

Browse source 
7523: Bump chalk and rustc_lexer r=lnicola a=lnicola

bors r+

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
This commit is contained in:
bors[bot] 2021-02-02 15:40:43 +00:00 committed by GitHub
commit 12e8cc4aa2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Cargo.lock generated
View file

@ -178,9 +178,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chalk-derive"
version = "0.51.0"
version = "0.55.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1a2ad10b964771ffc53ce7a8d6fce4bde3da0da82a1bc7a72668548db1c56ee"
checksum = "3983193cacd81f0f924acb666b7fe5e1a0d81db9f113fa69203eda7ea8ce8b6c"
dependencies = [
"proc-macro2",
"quote",
@ -190,9 +190,9 @@ dependencies = [
[[package]]
name = "chalk-ir"
version = "0.51.0"
version = "0.55.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17b14b40a09687aa5f0973721841d83a8a0e12a6b3ada1d2e01f0a694bb800ee"
checksum = "a522f53af971e7678f472d687e053120157b3ae26e2ebd5ecbc0f5ab124f2cb6"
dependencies = [
"bitflags",
"chalk-derive",
@ -201,9 +201,9 @@ dependencies = [
[[package]]
name = "chalk-recursive"
version = "0.51.0"
version = "0.55.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c7297bb1683f63a4b334b53cfdd81a721e8adde3441514e1126d24aaafe2552"
checksum = "8b0a6bc94f16aaba1dd6d1e2350945bbb0239c3633cdabeedbed601c1354d4b4"
dependencies = [
"chalk-derive",
"chalk-ir",
@ -214,9 +214,9 @@ dependencies = [
[[package]]
name = "chalk-solve"
version = "0.51.0"
version = "0.55.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82765c1a19e801d53fc9d145449701ddf79f394e6519f1e9c01fca1ee95d0ba7"
checksum = "cdf79fb77a567e456a170f7ec84ea6584163d4ba3f13660cd182013d34ca667c"
dependencies = [
"chalk-derive",
"chalk-ir",
@ -1377,9 +1377,9 @@ dependencies = [
[[package]]
name = "rustc-ap-rustc_lexer"
version = "701.0.0"
version = "702.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3601c20fc378d11e965fb1f670cf8bad1ef5164fe4ec8cbb7c57fa9d656f2541"
checksum = "47cfdb02425aed8c56f85692975d262cb438ea0388e0c8cd254e73bd22bb6539"
dependencies = [
"unicode-xid",
]

6
crates/hir_ty/Cargo.toml
View file

@ -17,9 +17,9 @@ ena = "0.14.0"
log = "0.4.8"
rustc-hash = "1.1.0"
scoped-tls = "1"
chalk-solve = { version = "0.51", default-features = false }
chalk-ir = "0.51"
chalk-recursive = "0.51"
chalk-solve = { version = "0.55", default-features = false }
chalk-ir = "0.55"
chalk-recursive = "0.55"
la-arena = { version = "0.2.0", path = "../../lib/arena" }
stdx = { path = "../stdx", version = "0.0.0" }

4
crates/hir_ty/src/traits/chalk.rs
View file

@ -675,7 +675,7 @@ pub(crate) fn fn_def_variance_query(
) -> Variances {
let callable_def: CallableDefId = from_chalk(db, fn_def_id);
let generic_params = generics(db.upcast(), callable_def.into());
Variances::from(
Variances::from_iter(
&Interner,
std::iter::repeat(chalk_ir::Variance::Invariant).take(generic_params.len()),
)
@ -688,7 +688,7 @@ pub(crate) fn adt_variance_query(
) -> Variances {
let adt: crate::AdtId = from_chalk(db, adt_id);
let generic_params = generics(db.upcast(), adt.into());
Variances::from(
Variances::from_iter(
&Interner,
std::iter::repeat(chalk_ir::Variance::Invariant).take(generic_params.len()),
)

2
crates/syntax/Cargo.toml
View file

@ -13,7 +13,7 @@ doctest = false
[dependencies]
itertools = "0.10.0"
rowan = "0.12.2"
rustc_lexer = { version = "701.0.0", package = "rustc-ap-rustc_lexer" }
rustc_lexer = { version = "702.0.0", package = "rustc-ap-rustc_lexer" }
rustc-hash = "1.1.0"
arrayvec = "0.5.1"
once_cell = "1.3.1"