nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-28 00:15:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify subst / subst_bound_vars a bit

Browse Source
This commit is contained in:
Florian Diebold 2019-05-04 18:41:48 +02:00
parent f43e69a64e
commit 19fbd91998
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -411,11 +411,7 @@ impl Ty {
pub fn subst(self, substs: &Substs) -> Ty {
self.fold(&mut |ty| match ty {
Ty::Param { idx, name } => {
if (idx as usize) < substs.len() {
substs[idx as usize].clone()
} else {
Ty::Param { idx, name }
}
substs.get(idx as usize).cloned().unwrap_or(Ty::Param { idx, name })
}
ty => ty,
})
@ -424,13 +420,7 @@ impl Ty {
/// Substitutes `Ty::Bound` vars (as opposed to type parameters).
pub fn subst_bound_vars(self, substs: &Substs) -> Ty {
self.fold(&mut |ty| match ty {
Ty::Bound(idx) => {
if (idx as usize) < substs.len() {
substs[idx as usize].clone()
} else {
Ty::Bound(idx)
}
}
Ty::Bound(idx) => substs.get(idx as usize).cloned().unwrap_or(Ty::Bound(idx)),
ty => ty,
})
}