diff options
| author | Eduard Burtescu <edy.burt@gmail.com> | 2016-04-29 08:30:54 +0300 |
|---|---|---|
| committer | Eduard Burtescu <edy.burt@gmail.com> | 2016-05-11 04:14:58 +0300 |
| commit | 20652162ca5e330cb9d637924c6d93cb43fbb6aa (patch) | |
| tree | a448be3895c6865ba828471f76309e234479295c /src/librustc_const_eval | |
| parent | 8f72d8127fd91911b80b8b8b9e0f51f6e001d748 (diff) | |
| download | rust-20652162ca5e330cb9d637924c6d93cb43fbb6aa.tar.gz rust-20652162ca5e330cb9d637924c6d93cb43fbb6aa.zip | |
rustc: More interning for data used in Ty<'tcx>.
Diffstat (limited to 'src/librustc_const_eval')
| -rw-r--r-- | src/librustc_const_eval/eval.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_const_eval/eval.rs b/src/librustc_const_eval/eval.rs index c06fd475628..22ffebc081b 100644 --- a/src/librustc_const_eval/eval.rs +++ b/src/librustc_const_eval/eval.rs @@ -92,7 +92,7 @@ fn lookup_variant_by_id<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, /// This generally happens in late/trans const evaluation. pub fn lookup_const_by_id<'a, 'tcx: 'a>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId, - substs: Option<subst::Substs<'tcx>>) + substs: Option<&'tcx subst::Substs<'tcx>>) -> Option<(&'tcx Expr, Option<ty::Ty<'tcx>>)> { if let Some(node_id) = tcx.map.as_local_node_id(def_id) { match tcx.map.find(node_id) { @@ -1004,11 +1004,11 @@ fn infer<'a, 'tcx>(i: ConstInt, fn resolve_trait_associated_const<'a, 'tcx: 'a>(tcx: TyCtxt<'a, 'tcx, 'tcx>, ti: &'tcx hir::TraitItem, trait_id: DefId, - rcvr_substs: subst::Substs<'tcx>) + rcvr_substs: &'tcx subst::Substs<'tcx>) -> Option<(&'tcx Expr, Option<ty::Ty<'tcx>>)> { let trait_ref = ty::Binder( - rcvr_substs.erase_regions().to_trait_ref(tcx, trait_id) + rcvr_substs.clone().erase_regions().to_trait_ref(tcx, trait_id) ); debug!("resolve_trait_associated_const: trait_ref={:?}", trait_ref); |
