remove formatter for hash

Author: zelosleone

src/hash.rs

@@ -3,7 +3,6 @@ use std::collections::{BTreeMap, HashMap};
 
 use rattler_conda_types::NoArchType;
 use serde::{Deserialize, Serialize};
-use serde_json::ser::Formatter;
 use sha1::{Digest, Sha1};
 
 use crate::{normalized_key::NormalizedKey, recipe::variable::Variable};
@@ -28,45 +27,6 @@ use crate::{normalized_key::NormalizedKey, recipe::variable::Variable};
 ///
 /// used variables - anything with a value in conda_build_config.yaml that applies to this
 ///    recipe.  Includes compiler if compiler jinja2 function is used.
-///
-/// This implements a formatter that uses the same formatting as
-/// as the standard lib python `json.dumps()`
-#[derive(Clone, Debug)]
-struct PythonFormatter {}
-
-impl Formatter for PythonFormatter {
-    #[inline]
-    fn begin_array_value<W>(&mut self, writer: &mut W, first: bool) -> std::io::Result<()>
-    where
-        W: ?Sized + std::io::Write,
-    {
-        if first {
-            Ok(())
-        } else {
-            writer.write_all(b", ")
-        }
-    }
-
-    #[inline]
-    fn begin_object_key<W>(&mut self, writer: &mut W, first: bool) -> std::io::Result<()>
-    where
-        W: ?Sized + std::io::Write,
-    {
-        if first {
-            Ok(())
-        } else {
-            writer.write_all(b", ")
-        }
-    }
-
-    #[inline]
-    fn begin_object_value<W>(&mut self, writer: &mut W) -> std::io::Result<()>
-    where
-        W: ?Sized + std::io::Write,
-    {
-        writer.write_all(b": ")
-    }
-}
 
 // TODO merge with the jinja function that we have for this
 fn short_version_from_spec(input: &str, length: u32) -> String {
@@ -97,15 +57,15 @@ pub struct HashInput(String);
 impl HashInput {
     /// Create a new hash input from a variant
     pub fn from_variant(variant: &BTreeMap<NormalizedKey, Variable>) -> Self {
-        let mut buf = Vec::new();
-        let mut ser = serde_json::Serializer::with_formatter(&mut buf, PythonFormatter {});
-
-        // BTree has sorted keys, which is important for hashing
-        variant
-            .serialize(&mut ser)
-            .expect("Failed to serialize input");
-
-        Self(String::from_utf8(buf).expect("Failed to convert to string"))
+        // Convert the variant into a simple BTreeMap<String, String> to ensure consistent serialization
+        let mut map = BTreeMap::new();
+        for (key, value) in variant {
+            map.insert(key.normalize(), value.to_string());
+        }
+        
+        // Use serde_json with default formatting to match Python's json.dumps()
+        let json = serde_json::to_string(&map).expect("Failed to serialize input");
+        Self(json)
     }
 
     /// Get the hash input as a string