Skip to content

Commit 588fa2c

Browse files
committed
Bump rustc_pattern_analysis
1 parent a7bc556 commit 588fa2c

File tree

3 files changed

+30
-32
lines changed

3 files changed

+30
-32
lines changed

Cargo.lock

Lines changed: 12 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 10 additions & 11 deletions
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

crates/hir-ty/src/diagnostics/match_check/pat_analysis.rs

Lines changed: 8 additions & 8 deletions
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)