diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-03-05 10:36:31 -0700 |
|---|---|---|
| committer | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-03-06 07:04:04 -0700 |
| commit | 403ae37ce8f680e378dc77904a27453df0867b99 (patch) | |
| tree | dd5e69756c13accab0358667848df53f51511013 | |
| parent | 89fe4df9c7095f3f449a89bae97d087e7df08fcb (diff) | |
| download | rust-403ae37ce8f680e378dc77904a27453df0867b99.tar.gz rust-403ae37ce8f680e378dc77904a27453df0867b99.zip | |
Remove reference to Ty.
| -rw-r--r-- | src/librustc_typeck/check/mod.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index ae4cb48b7c6..2b9ccf6d3e2 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -1935,10 +1935,10 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { // We must collect the defaults *before* we do any unification. Because we have // directly attached defaults to the type variables any unification that occurs // will erase defaults causing conflicting defaults to be completely ignored. - let default_map: FxHashMap<_, _> = + let default_map: FxHashMap<Ty<'tcx>, _> = unsolved_variables .iter() - .filter_map(|t| self.default(t).map(|d| (t, d))) + .filter_map(|t| self.default(t).map(|d| (*t, d))) .collect(); let mut unbound_tyvars = FxHashSet(); @@ -2068,7 +2068,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { fn apply_defaults_and_return_conflicts<'b>( &'b self, unbound_vars: &'b FxHashSet<Ty<'tcx>>, - default_map: &'b FxHashMap<&'b Ty<'tcx>, type_variable::Default<'tcx>>, + default_map: &'b FxHashMap<Ty<'tcx>, type_variable::Default<'tcx>>, conflict: Option<Ty<'tcx>>, ) -> impl Iterator<Item=(Ty<'tcx>, type_variable::Default<'tcx>)> + 'b { use rustc::ty::error::UnconstrainedNumeric::Neither; @@ -2087,7 +2087,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { self.demand_eqtype(syntax_pos::DUMMY_SP, ty, self.tcx.types.f64) }, Neither => { - if let Some(default) = default_map.get(&ty) { + if let Some(default) = default_map.get(ty) { let default = default.clone(); let default_ty = self.normalize_associated_types_in( default.origin_span, &default.ty); |
