language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Auto merge of #13257 - rust-lang:revert-13147-fix/dyn-ty-inherent-methods, r=lnicola

Browse source 
fix: Fix a crash introduced in #13147

Reverts rust-lang/rust-analyzer#13147

4898678721 (step):18:62
This commit is contained in:
bors 2022-09-19 09:46:21 +00:00
commit 187bee0bb1
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/hir-ty/src/method_resolution.rs
View file

@ -989,7 +989,7 @@ fn iterate_inherent_methods(
)?; )?;
} }
TyKind::Dyn(_) => { TyKind::Dyn(_) => {
let principal_trait = self_ty.dyn_trait().unwrap(); if let Some(principal_trait) = self_ty.dyn_trait() {
let traits = all_super_traits(db.upcast(), principal_trait); let traits = all_super_traits(db.upcast(), principal_trait);
iterate_inherent_trait_methods( iterate_inherent_trait_methods(
self_ty, self_ty,
@ -1001,6 +1001,7 @@ fn iterate_inherent_methods(
traits.into_iter(), traits.into_iter(),
)?; )?;
} }
}
_ => {} _ => {}
} }