From: Nick Cameron <ncameron@mozilla.com>
Date: Sun, 21 Aug 2016 21:31:26 +0000 (+1200)
Subject: Fix type error with `?` in existing code.
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=c32456da8f14a7c4206278c55b90a535c4d98e20;p=rust.git

Fix type error with `?` in existing code.
---

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))
 }