From 9dc1c339ef1f25e4be9bd04b3ad7280e116aefb8 Mon Sep 17 00:00:00 2001
From: Mark <markjordanthom@gmail.com>
Date: Fri, 15 Sep 2023 14:10:42 -0600
Subject: [PATCH] remove unnecessary Result return type from
 read_term_from_heap

---
 Cargo.lock             |  6 ++++--
 src/machine/compile.rs |  2 +-
 src/machine/loader.rs  | 18 +++++++++---------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a2a4121d..c383d82e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1126,7 +1126,8 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 [[package]]
 name = "libffi"
 version = "3.2.0"
-source = "git+https://github.com/coasys/libffi-rs.git?branch=windows-space#f6e9e50efde0aa4e940dd6f709a59bb426875362"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce826c243048e3d5cec441799724de52e2d42f820468431fc3fceee2341871e2"
 dependencies = [
  "libc",
  "libffi-sys",
@@ -1135,7 +1136,8 @@ dependencies = [
 [[package]]
 name = "libffi-sys"
 version = "2.3.0"
-source = "git+https://github.com/coasys/libffi-rs.git?branch=windows-space#f6e9e50efde0aa4e940dd6f709a59bb426875362"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f36115160c57e8529781b4183c2bb51fdc1f6d6d1ed345591d84be7703befb3c"
 dependencies = [
  "cc",
 ]
diff --git a/src/machine/compile.rs b/src/machine/compile.rs
index 170bffaf..2245ef41 100644
--- a/src/machine/compile.rs
+++ b/src/machine/compile.rs
@@ -2331,7 +2331,7 @@ impl Machine {
             let mut loader: Loader<'_, InlineLoadState<'_>> =
                 Loader::new(self, InlineTermStream {});
 
-            let term = loader.read_term_from_heap(term_loc)?;
+            let term = loader.read_term_from_heap(term_loc);
             let clause = build_rule_body(vars, term);
 
             let settings = CodeGenSettings {
diff --git a/src/machine/loader.rs b/src/machine/loader.rs
index b5133700..59db0208 100644
--- a/src/machine/loader.rs
+++ b/src/machine/loader.rs
@@ -483,7 +483,7 @@ impl<'a, LS: LoadState<'a>> Loader<'a, LS> {
         }
     }
 
-    pub(crate) fn read_term_from_heap(&mut self, r: RegType) -> Result<Term, SessionError> {
+    pub(crate) fn read_term_from_heap(&mut self, r: RegType) -> Term {
         let machine_st = LS::machine_st(&mut self.payload);
         let cell = machine_st[r];
 
@@ -1074,7 +1074,7 @@ impl<'a, LS: LoadState<'a>> Loader<'a, LS> {
         let machine_st = LS::machine_st(&mut self.payload);
         let cell = machine_st[r];
 
-        let export_list = machine_st.read_term_from_heap(cell)?;
+        let export_list = machine_st.read_term_from_heap(cell);
         let atom_tbl = &mut LS::machine_st(&mut self.payload).atom_tbl;
         let export_list = setup_module_export_list(export_list, &atom_tbl)?;
 
@@ -1401,7 +1401,7 @@ impl MachineState {
     pub(super) fn read_term_from_heap(
         &mut self,
         term_addr: HeapCellValue,
-    ) -> Result<Term, SessionError> {
+    ) -> Term {
         let mut term_stack = vec![];
         let mut iter = stackful_post_order_iter(&mut self.heap, &mut self.stack, term_addr);
 
@@ -1494,7 +1494,7 @@ impl MachineState {
         }
 
         debug_assert!(term_stack.len() == 1);
-        Ok(term_stack.pop().unwrap())
+        term_stack.pop().unwrap()
     }
 }
 
@@ -1661,7 +1661,7 @@ impl Machine {
         let mut loader = self.loader_from_heap_evacuable(temp_v!(2));
 
         let add_clause = || {
-            let term = loader.read_term_from_heap(temp_v!(1))?;
+            let term = loader.read_term_from_heap(temp_v!(1));
 
             loader.incremental_compile_clause(
                 (atom!("term_expansion"), 2),
@@ -1691,7 +1691,7 @@ impl Machine {
         };
 
         let add_clause = || {
-            let term = loader.read_term_from_heap(temp_v!(2))?;
+            let term = loader.read_term_from_heap(temp_v!(2));
 
             let indexing_arg = match term.name() {
                 Some(atom!(":-")) => term.first_arg().and_then(Term::first_arg),
@@ -2008,7 +2008,7 @@ impl Machine {
             loader.payload.compilation_target = compilation_target;
 
             let head = LiveLoadAndMachineState::machine_st(&mut loader.payload)
-                .read_term_from_heap(head)?;
+                .read_term_from_heap(head);
 
             let name = if let Some(name) = head.name() {
                 name
@@ -2044,7 +2044,7 @@ impl Machine {
                 return LiveLoadAndMachineState::evacuate(loader);
             }
 
-            let body = loader.read_term_from_heap(temp_v!(3))?;
+            let body = loader.read_term_from_heap(temp_v!(3));
 
             let asserted_clause = Term::Clause(
                 Cell::default(),
@@ -2482,7 +2482,7 @@ impl<'a> Loader<'a, LiveLoadAndMachineState<'a>> {
             self.payload.predicates.compilation_target = compilation_target;
         }
 
-        let term = self.read_term_from_heap(term_reg)?;
+        let term = self.read_term_from_heap(term_reg);
 
         self.add_clause_clause_if_dynamic(&term)?;
         self.payload.term_stream.term_queue.push_back(term);
-- 
2.54.0