]> git.lizzy.rs Git - rust.git/commitdiff
Fix type error with `?` in existing code.
authorNick Cameron <ncameron@mozilla.com>
Sun, 21 Aug 2016 21:31:26 +0000 (09:31 +1200)
committerNick Cameron <ncameron@mozilla.com>
Sun, 21 Aug 2016 21:31:26 +0000 (09:31 +1200)
src/librustc/ty/relate.rs

index abf863f953664258de01fbcbf4f0ba40b8603922..8975a799be14328bd2ab057dbf7eafe5cf90e4e2 100644 (file)
@@ -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))
 }