From: Mark Thom Date: Wed, 19 Dec 2018 04:42:34 +0000 (-0700) Subject: remove lifetime on ReverseHeapVarDict X-Git-Tag: v0.8.110~311 X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=5c12c3047c645a6003a9c40509ddfb36c22b1f5a;p=scryer-prolog.git remove lifetime on ReverseHeapVarDict --- diff --git a/src/prolog/heap_print.rs b/src/prolog/heap_print.rs index c854b176..ede4a537 100644 --- a/src/prolog/heap_print.rs +++ b/src/prolog/heap_print.rs @@ -119,13 +119,13 @@ impl MachineState { } } -type ReverseHeapVarDict<'a> = HashMap>; +type ReverseHeapVarDict = HashMap>; pub struct HCPrinter<'a, Outputter> { outputter: Outputter, machine_st: &'a MachineState, state_stack: Vec, - heap_locs: ReverseHeapVarDict<'a>, + heap_locs: ReverseHeapVarDict, printed_vars: HashSet, pub(crate) numbervars: bool, pub(crate) quoted: bool, @@ -168,7 +168,7 @@ fn continues_with_append(atom: &str, op: &str) -> bool { } fn reverse_heap_locs<'a>(machine_st: &'a MachineState, heap_locs: &'a HeapVarDict) - -> ReverseHeapVarDict<'a> + -> ReverseHeapVarDict { heap_locs.iter().map(|(var, var_addr)| { (machine_st.store(machine_st.deref(var_addr.clone())), var.clone())