From: Mark Thom <markjordanthom@gmail.com>
Date: Fri, 26 Apr 2024 02:05:22 +0000 (-0600)
Subject: fix failing clippy checks, remove unnecessary code
X-Git-Tag: v0.10.0~135^2~1
X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=5e1effc69ad590be7ed459ab739fe1ea2ba51ffd;p=scryer-prolog.git

fix failing clippy checks, remove unnecessary code
---

diff --git a/src/arena.rs b/src/arena.rs
index bd4d294c..7bae991c 100644
--- a/src/arena.rs
+++ b/src/arena.rs
@@ -24,10 +24,7 @@ use std::sync::RwLock;
 macro_rules! arena_alloc {
     ($e:expr, $arena:expr) => {{
         let result = $e;
-        #[allow(unused_unsafe)]
-        unsafe {
-            ArenaAllocated::alloc($arena, result)
-        }
+        ArenaAllocated::alloc($arena, result)
     }};
 }
 
@@ -35,10 +32,7 @@ macro_rules! arena_alloc {
 macro_rules! float_alloc {
     ($e:expr, $arena:expr) => {{
         let result = $e;
-        #[allow(unused_unsafe)]
-        unsafe {
-            $arena.f64_tbl.build_with(result).as_ptr()
-        }
+        unsafe { $arena.f64_tbl.build_with(result).as_ptr() }
     }};
 }
 
@@ -746,8 +740,6 @@ impl Drop for Arena {
                 ptr = slab.next;
             }
         }
-
-        self.base = None;
     }
 }
 
diff --git a/src/machine/machine_indices.rs b/src/machine/machine_indices.rs
index 1ae2527b..830cc91f 100644
--- a/src/machine/machine_indices.rs
+++ b/src/machine/machine_indices.rs
@@ -298,9 +298,11 @@ impl IndexStore {
             _ => self
                 .get_meta_predicate_spec(key.0, key.1, &compilation_target)
                 .map(|meta_specs| {
-                    meta_specs.iter().find(|meta_spec| match meta_spec {
-                        MetaSpec::Colon | MetaSpec::RequiresExpansionWithArgument(_) => true,
-                        _ => false,
+                    meta_specs.iter().find(|meta_spec| {
+                        matches!(
+                            meta_spec,
+                            MetaSpec::Colon | MetaSpec::RequiresExpansionWithArgument(_)
+                        )
                     })
                 })
                 .map(|meta_spec_opt| meta_spec_opt.is_some())
diff --git a/src/machine/system_calls.rs b/src/machine/system_calls.rs
index 8dafa43e..80b579e7 100644
--- a/src/machine/system_calls.rs
+++ b/src/machine/system_calls.rs
@@ -428,14 +428,12 @@ impl BrentAlgState {
 
                 pstr_chars = pstr.as_str_from(n).chars().count() - 1;
 
-                if heap[h].get_tag() == HeapCellValueTag::PStrOffset {
-                    if heap[h_offset].get_tag() == HeapCellValueTag::CStr {
-                        return if pstr_chars < max_steps {
-                            CycleSearchResult::ProperList(pstr_chars + 1)
-                        } else {
-                            let offset = max_steps as usize + n;
-                            CycleSearchResult::PStrLocation(max_steps, h_offset, offset)
-                        }
+                if heap[h].get_tag() == HeapCellValueTag::PStrOffset && heap[h_offset].get_tag() == HeapCellValueTag::CStr {
+                    return if pstr_chars < max_steps {
+                        CycleSearchResult::ProperList(pstr_chars + 1)
+                    } else {
+                        let offset = max_steps + n;
+                        CycleSearchResult::PStrLocation(max_steps, h_offset, offset)
                     }
                 }
 
diff --git a/src/parser/char_reader.rs b/src/parser/char_reader.rs
index a6dd75db..bc9c1601 100644
--- a/src/parser/char_reader.rs
+++ b/src/parser/char_reader.rs
@@ -327,12 +327,11 @@ impl<R: Read> Read for CharReader<R> {
             return self.inner.read_vectored(bufs);
         }
 
-        let nread = {
-            self.refresh_buffer()?;
-            (&self.buf[self.pos..]).read_vectored(bufs)?
-        };
+        self.refresh_buffer()?;
 
+        let nread = (&self.buf[self.pos..]).read_vectored(bufs)?;
         self.consume(nread);
+
         Ok(nread)
     }
 }