diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2016-08-22 09:31:26 +1200 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2016-08-22 09:31:26 +1200 |
| commit | c32456da8f14a7c4206278c55b90a535c4d98e20 (patch) | |
| tree | cbb7b5e83eadd160cd154d58253e9a3ce07e4d31 | |
| parent | 5aa89d8bf6dcf3f7c08f3db8f48b54676b6203b8 (diff) | |
| download | rust-c32456da8f14a7c4206278c55b90a535c4d98e20.tar.gz rust-c32456da8f14a7c4206278c55b90a535c4d98e20.zip | |
Fix type error with `?` in existing code.
| -rw-r--r-- | src/librustc/ty/relate.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc/ty/relate.rs b/src/librustc/ty/relate.rs index abf863f9536..8975a799be1 100644 --- a/src/librustc/ty/relate.rs +++ b/src/librustc/ty/relate.rs @@ -151,13 +151,13 @@ pub fn relate_substs<'a, 'gcx, 'tcx, R>(relation: &mut R, let b_ty = &b_subst.types[i]; let variance = variances.map_or(ty::Invariant, |v| v.types[i]); relation.relate_with_variance(variance, a_ty, b_ty) - }).collect()?; + }).collect::<Result<_, _>>()?; let regions = a_subst.regions.iter().enumerate().map(|(i, a_r)| { let b_r = &b_subst.regions[i]; let variance = variances.map_or(ty::Invariant, |v| v.regions[i]); relation.relate_with_variance(variance, a_r, b_r) - }).collect()?; + }).collect::<Result<_, _>>()?; Ok(Substs::new(tcx, types, regions)) } |
