From a0e598b97e3371c811e4859b3f28e1e032397bbb Mon Sep 17 00:00:00 2001
From: Nicolas Luck <nicolas@lucksus.eu>
Date: Thu, 1 Feb 2024 13:51:37 +0100
Subject: [PATCH] clippy

---
 src/heap_print.rs             |  2 +-
 src/machine/parsed_results.rs | 22 +++++++++++-----------
 src/machine/streams.rs        |  2 +-
 src/machine/system_calls.rs   |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/heap_print.rs b/src/heap_print.rs
index 515ebef6..e788c253 100644
--- a/src/heap_print.rs
+++ b/src/heap_print.rs
@@ -1727,7 +1727,7 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
                        self.print_stream(stream, max_depth);
                    }
                    (ArenaHeaderTag::TcpListener, listener) => {
-                       self.print_tcp_listener(&*listener, max_depth);
+                       self.print_tcp_listener(&listener, max_depth);
                    }
                    (ArenaHeaderTag::Dropped, _value) => {
                        self.print_impromptu_atom(atom!("$dropped_value"));
diff --git a/src/machine/parsed_results.rs b/src/machine/parsed_results.rs
index 738bc938..a34f13d9 100644
--- a/src/machine/parsed_results.rs
+++ b/src/machine/parsed_results.rs
@@ -25,10 +25,10 @@ pub fn prolog_value_to_json_tring(value: Value) -> String {
                 //escape double quotes
                 format!(
                     "\"{}\"",
-                    s.replace("\"", "\\\"")
-                        .replace("\n", "\\n")
-                        .replace("\t", "\\t")
-                        .replace("\r", "\\r")
+                    s.replace('\"', "\\\"")
+                        .replace('\n', "\\n")
+                        .replace('\t', "\\t")
+                        .replace('\r', "\\r")
                 )
             } else {
                 //return valid json string
@@ -39,22 +39,22 @@ pub fn prolog_value_to_json_tring(value: Value) -> String {
             let mut string_result = "[".to_string();
             for (i, v) in l.iter().enumerate() {
                 if i > 0 {
-                    string_result.push_str(",");
+                    string_result.push(',');
                 }
                 string_result.push_str(&prolog_value_to_json_tring(v.clone()));
             }
-            string_result.push_str("]");
+            string_result.push(']');
             string_result
         }
         Value::Structure(s, l) => {
             let mut string_result = format!("\"{}\":[", s.as_str());
             for (i, v) in l.iter().enumerate() {
                 if i > 0 {
-                    string_result.push_str(",");
+                    string_result.push(',');
                 }
                 string_result.push_str(&prolog_value_to_json_tring(v.clone()));
             }
-            string_result.push_str("]");
+            string_result.push(']');
             string_result
         }
         _ => "null".to_string(),
@@ -65,7 +65,7 @@ fn prolog_match_to_json_string(query_match: &QueryMatch) -> String {
     let mut string_result = "{".to_string();
     for (i, (k, v)) in query_match.bindings.iter().enumerate() {
         if i > 0 {
-            string_result.push_str(",");
+            string_result.push(',');
         }
         string_result.push_str(&format!(
             "\"{}\":{}",
@@ -73,7 +73,7 @@ fn prolog_match_to_json_string(query_match: &QueryMatch) -> String {
             prolog_value_to_json_tring(v.clone())
         ));
     }
-    string_result.push_str("}");
+    string_result.push('}');
     string_result
 }
 
@@ -85,7 +85,7 @@ impl ToString for QueryResolution {
             QueryResolution::Matches(matches) => {
                 let matches_json: Vec<String> = matches
                     .iter()
-                    .map(|m| prolog_match_to_json_string(m))
+                    .map(prolog_match_to_json_string)
                     .collect();
                 format!("[{}]", matches_json.join(","))
             }
diff --git a/src/machine/streams.rs b/src/machine/streams.rs
index 53269bf4..e05ad983 100644
--- a/src/machine/streams.rs
+++ b/src/machine/streams.rs
@@ -1875,7 +1875,7 @@ impl MachineState {
             };
 
             if path.extension().is_none() {
-                if let Some(metadata) = file.metadata().ok() {
+                if let Ok(metadata) = file.metadata() {
                     if metadata.is_dir() {
                         path.set_extension("pl");
                         continue;
diff --git a/src/machine/system_calls.rs b/src/machine/system_calls.rs
index 5a10358d..73bf62f2 100644
--- a/src/machine/system_calls.rs
+++ b/src/machine/system_calls.rs
@@ -5629,7 +5629,7 @@ impl Machine {
 
     #[inline(always)]
     pub(crate) fn inference_count(&mut self, count_var: HeapCellValue, count: Integer) {
-        if let Some(value) = <&Integer as TryInto<i64>>::try_into(&count).ok() {
+        if let Ok(value) = <&Integer as TryInto<i64>>::try_into(&count) {
             self.machine_st
                 .unify_fixnum(Fixnum::build_with(value), count_var);
         } else {
-- 
2.54.0