itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #586

Browse Source 
586: Fix panic trying to get substs on unknown type r=matklad a=flodiebold

Fixes #585.

Co-authored-by: Florian Diebold <flodiebold@gmail.com>
This commit is contained in:
bors[bot] 2019-01-21 20:47:01 +00:00
commit 0d2cb60f93
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ra_hir/src/ty.rs
View File

@ -1134,7 +1134,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
self.unify(&ty, expected); self.unify(&ty, expected);
let substs = ty.substs().expect("adt should have substs"); let substs = ty.substs().unwrap_or_else(Substs::empty);
for (i, &subpat) in subpats.iter().enumerate() { for (i, &subpat) in subpats.iter().enumerate() {
let expected_ty = fields let expected_ty = fields
@ -1155,7 +1155,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
self.unify(&ty, expected); self.unify(&ty, expected);
let substs = ty.substs().expect("adt should have substs"); let substs = ty.substs().unwrap_or_else(Substs::empty);
for subpat in subpats { for subpat in subpats {
let matching_field = fields.iter().find(|field| field.name() == &subpat.name); let matching_field = fields.iter().find(|field| field.name() == &subpat.name);
@ -1403,7 +1403,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
spread, spread,
} => { } => {
let (ty, def_id) = self.resolve_variant(path.as_ref()); let (ty, def_id) = self.resolve_variant(path.as_ref());
let substs = ty.substs().expect("adt should have substs"); let substs = ty.substs().unwrap_or_else(Substs::empty);
for field in fields { for field in fields {
let field_ty = if let Some(def_id) = def_id { let field_ty = if let Some(def_id) = def_id {
self.db self.db

16
crates/ra_hir/src/ty/tests.rs
View File

@ -521,6 +521,22 @@ fn test(x: X) {
); );
} }
#[test]
fn bug_585() {
check_inference(
r#"
fn test() {
X {};
match x {
A::B {} => (),
A::Y() => (),
}
}
"#,
"bug_585.txt",
);
}
fn infer(content: &str) -> String { fn infer(content: &str) -> String {
let (db, _, file_id) = MockDatabase::with_single_file(content); let (db, _, file_id) = MockDatabase::with_single_file(content);
let source_file = db.source_file(file_id); let source_file = db.source_file(file_id);

8
crates/ra_hir/src/ty/tests/data/bug_585.txt Normal file
View File

@ -0,0 +1,8 @@
[11; 89) '{ ... } }': ()
[17; 21) 'X {}': [unknown]
[27; 87) 'match ... }': ()
[33; 34) 'x': [unknown]
[45; 52) 'A::B {}': [unknown]
[56; 58) '()': ()
[68; 74) 'A::Y()': [unknown]
[78; 80) '()': ()