Skip to content

Commit 4ea0db9

Browse files
committed
Bump rustc_pattern_analysis
1 parent 6911d9f commit 4ea0db9

File tree

3 files changed

+30
-32
lines changed

3 files changed

+30
-32
lines changed

src/tools/rust-analyzer/Cargo.lock

+12-13
Original file line numberDiff line numberDiff line change
@@ -1474,9 +1474,9 @@ dependencies = [
14741474

14751475
[[package]]
14761476
name = "ra-ap-rustc_abi"
1477-
version = "0.53.0"
1477+
version = "0.63.0"
14781478
source = "registry+https://github.com/rust-lang/crates.io-index"
1479-
checksum = "80b1d613eee933486c0613a7bc26e515e46f43adf479d1edd5e537f983e9ce46"
1479+
checksum = "b011c39d409940a890414e3a7b239762ac16d88029ad71b050a8374831b93790"
14801480
dependencies = [
14811481
"bitflags 2.6.0",
14821482
"ra-ap-rustc_index",
@@ -1485,9 +1485,9 @@ dependencies = [
14851485

14861486
[[package]]
14871487
name = "ra-ap-rustc_index"
1488-
version = "0.53.0"
1488+
version = "0.63.0"
14891489
source = "registry+https://github.com/rust-lang/crates.io-index"
1490-
checksum = "f072060ac77e9e1a02cc20028095993af7e72cc0804779c68bcbf47b16de49c9"
1490+
checksum = "9027acdee649b0b27eb10b7db5be833efee3362d394935c5eed8f0745a9d43ce"
14911491
dependencies = [
14921492
"arrayvec",
14931493
"ra-ap-rustc_index_macros",
@@ -1496,41 +1496,40 @@ dependencies = [
14961496

14971497
[[package]]
14981498
name = "ra-ap-rustc_index_macros"
1499-
version = "0.53.0"
1499+
version = "0.63.0"
15001500
source = "registry+https://github.com/rust-lang/crates.io-index"
1501-
checksum = "82f3d6dcb30a66905388e14756b8f2216131d9f8004922c07f13335840e058d1"
1501+
checksum = "540b86dc0384141ac8e825fc2874cd44bffd4277d99d8ec63ee416f1a98d5997"
15021502
dependencies = [
15031503
"proc-macro2",
15041504
"quote",
15051505
"syn",
1506-
"synstructure",
15071506
]
15081507

15091508
[[package]]
15101509
name = "ra-ap-rustc_lexer"
1511-
version = "0.53.0"
1510+
version = "0.63.0"
15121511
source = "registry+https://github.com/rust-lang/crates.io-index"
1513-
checksum = "dbd8a2b0bdcba9892cbce0b25f6c953d31b0febc1f3420fc692884fce5a23ad8"
1512+
checksum = "3bdf98bb457b47b9ae4aeebf867d0ca440c86925e0b6381658c4a02589748c9d"
15141513
dependencies = [
15151514
"unicode-properties",
15161515
"unicode-xid",
15171516
]
15181517

15191518
[[package]]
15201519
name = "ra-ap-rustc_parse_format"
1521-
version = "0.53.0"
1520+
version = "0.63.0"
15221521
source = "registry+https://github.com/rust-lang/crates.io-index"
1523-
checksum = "70dad7a491c2554590222e0c9212dcb7c2e7aceb668875075012a35ea780d135"
1522+
checksum = "e8fe3556ab6311bb775220563a300e2bf62ec56404521fe0c511a583937683d5"
15241523
dependencies = [
15251524
"ra-ap-rustc_index",
15261525
"ra-ap-rustc_lexer",
15271526
]
15281527

15291528
[[package]]
15301529
name = "ra-ap-rustc_pattern_analysis"
1531-
version = "0.53.0"
1530+
version = "0.63.0"
15321531
source = "registry+https://github.com/rust-lang/crates.io-index"
1533-
checksum = "34768e1faf88c31f2e9ad57b48318a52b507dafac0cddbf01b5d63bfc0b0a365"
1532+
checksum = "1709080fdeb5db630e1c2644026c2962aaa32416cd92f0190c04b0c21e114b91"
15341533
dependencies = [
15351534
"ra-ap-rustc_index",
15361535
"rustc-hash",

src/tools/rust-analyzer/Cargo.toml

+10-11
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ tt = { path = "./crates/tt", version = "0.0.0" }
8484
vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
8585
vfs = { path = "./crates/vfs", version = "0.0.0" }
8686

87-
ra-ap-rustc_lexer = { version = "0.53.0", default-features = false }
88-
ra-ap-rustc_parse_format = { version = "0.53.0", default-features = false }
89-
ra-ap-rustc_index = { version = "0.53.0", default-features = false }
90-
ra-ap-rustc_abi = { version = "0.53.0", default-features = false }
91-
ra-ap-rustc_pattern_analysis = { version = "0.53.0", default-features = false }
87+
ra-ap-rustc_lexer = { version = "0.63.0", default-features = false }
88+
ra-ap-rustc_parse_format = { version = "0.63.0", default-features = false }
89+
ra-ap-rustc_index = { version = "0.63.0", default-features = false }
90+
ra-ap-rustc_abi = { version = "0.63.0", default-features = false }
91+
ra-ap-rustc_pattern_analysis = { version = "0.63.0", default-features = false }
9292

9393
# local crates that aren't published to crates.io. These should not have versions.
9494
test-fixture = { path = "./crates/test-fixture" }
@@ -125,11 +125,11 @@ memmap2 = "0.5.4"
125125
nohash-hasher = "0.2.0"
126126
oorandom = "11.1.3"
127127
object = { version = "0.33.0", default-features = false, features = [
128-
"std",
129-
"read_core",
130-
"elf",
131-
"macho",
132-
"pe",
128+
"std",
129+
"read_core",
130+
"elf",
131+
"macho",
132+
"pe",
133133
] }
134134
process-wrap = { version = "8.0.2", features = ["std"] }
135135
pulldown-cmark-to-cmark = "10.0.4"
@@ -159,7 +159,6 @@ url = "2.3.1"
159159
xshell = "0.2.5"
160160

161161

162-
163162
# We need to freeze the version of the crate, as the raw-api feature is considered unstable
164163
dashmap = { version = "=5.5.3", features = ["raw-api"] }
165164

src/tools/rust-analyzer/crates/hir-ty/src/diagnostics/match_check/pat_analysis.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,8 @@ impl<'db> MatchCheckCtx<'db> {
304304
&Str(void) => match void {},
305305
Wildcard | NonExhaustive | Hidden | PrivateUninhabited => PatKind::Wild,
306306
Never => PatKind::Never,
307-
Missing | F32Range(..) | F64Range(..) | Opaque(..) | Or => {
307+
Missing | F16Range(..) | F32Range(..) | F64Range(..) | F128Range(..) | Opaque(..)
308+
| Or => {
308309
never!("can't convert to pattern: {:?}", pat.ctor());
309310
PatKind::Wild
310311
}
@@ -324,9 +325,6 @@ impl<'db> PatCx for MatchCheckCtx<'db> {
324325
fn is_exhaustive_patterns_feature_on(&self) -> bool {
325326
self.exhaustive_patterns
326327
}
327-
fn is_min_exhaustive_patterns_feature_on(&self) -> bool {
328-
true
329-
}
330328

331329
fn ctor_arity(
332330
&self,
@@ -353,8 +351,9 @@ impl<'db> PatCx for MatchCheckCtx<'db> {
353351
},
354352
Ref => 1,
355353
Slice(..) => unimplemented!(),
356-
Never | Bool(..) | IntRange(..) | F32Range(..) | F64Range(..) | Str(..)
357-
| Opaque(..) | NonExhaustive | PrivateUninhabited | Hidden | Missing | Wildcard => 0,
354+
Never | Bool(..) | IntRange(..) | F16Range(..) | F32Range(..) | F64Range(..)
355+
| F128Range(..) | Str(..) | Opaque(..) | NonExhaustive | PrivateUninhabited
356+
| Hidden | Missing | Wildcard => 0,
358357
Or => {
359358
never!("The `Or` constructor doesn't have a fixed arity");
360359
0
@@ -416,8 +415,9 @@ impl<'db> PatCx for MatchCheckCtx<'db> {
416415
}
417416
},
418417
Slice(_) => unreachable!("Found a `Slice` constructor in match checking"),
419-
Never | Bool(..) | IntRange(..) | F32Range(..) | F64Range(..) | Str(..)
420-
| Opaque(..) | NonExhaustive | PrivateUninhabited | Hidden | Missing | Wildcard => {
418+
Never | Bool(..) | IntRange(..) | F16Range(..) | F32Range(..) | F64Range(..)
419+
| F128Range(..) | Str(..) | Opaque(..) | NonExhaustive | PrivateUninhabited
420+
| Hidden | Missing | Wildcard => {
421421
smallvec![]
422422
}
423423
Or => {

0 commit comments

Comments
 (0)