language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 12:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Resolve #17344 by using .get(…) instead of […] in TypeOrConstParam::source(…)

Browse source 
(… and `LifetimeParam::source(…)`)
This commit is contained in:
Vincent Esche 2024-06-05 11:03:56 +02:00
parent 29e5cdfb05
commit 78f31696da
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/hir/src/has_source.rs
View file

@ -202,7 +202,7 @@ impl HasSource for TypeOrConstParam {
type Ast = Either<ast::TypeOrConstParam, ast::TraitOrAlias>; type Ast = Either<ast::TypeOrConstParam, ast::TraitOrAlias>;
fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> { fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
let child_source = self.id.parent.child_source(db.upcast()); let child_source = self.id.parent.child_source(db.upcast());
Some(child_source.map(|it| it[self.id.local_id].clone())) child_source.map(|it| it.get(self.id.local_id).cloned()).transpose()
} }
} }
@ -210,7 +210,7 @@ impl HasSource for LifetimeParam {
type Ast = ast::LifetimeParam; type Ast = ast::LifetimeParam;
fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> { fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
let child_source = self.id.parent.child_source(db.upcast()); let child_source = self.id.parent.child_source(db.upcast());
Some(child_source.map(|it| it[self.id.local_id].clone())) child_source.map(|it| it.get(self.id.local_id).cloned()).transpose()
} }
} }