Cleanup

Author: marcoroth

ext/herb/extension.c

@@ -434,11 +434,17 @@ static VALUE rb_create_diff_operation(const herb_diff_operation_T* operation) {
   VALUE old_node = operation->old_node != NULL ? rb_node_from_c_struct((AST_NODE_T*) operation->old_node) : Qnil;
   VALUE new_node = operation->new_node != NULL ? rb_node_from_c_struct((AST_NODE_T*) operation->new_node) : Qnil;
 
-  VALUE args[] = {
-    type, path_array, old_node, new_node, UINT2NUM(operation->old_index), UINT2NUM(operation->new_index)
-  };
-
-  return rb_class_new_instance(6, args, cDiffOperation);
+  return rb_funcall(
+    cDiffOperation,
+    rb_intern("new"),
+    6,
+    type,
+    path_array,
+    old_node,
+    new_node,
+    UINT2NUM(operation->old_index),
+    UINT2NUM(operation->new_index)
+  );
 }
 
 static VALUE diff_convert_body(VALUE arg) {

rust/src/herb.rs

@@ -346,8 +346,13 @@ pub fn diff(old_source: &str, new_source: &str) -> Result<DiffResult, String> {
     let new_root = crate::ffi::herb_parse(new_c_source.as_ptr(), &parser_options, &mut new_allocator);
 
     if old_root.is_null() || new_root.is_null() {
-      if !old_root.is_null() { crate::ffi::ast_node_free(old_root as *mut AST_NODE_T, &mut old_allocator); }
-      if !new_root.is_null() { crate::ffi::ast_node_free(new_root as *mut AST_NODE_T, &mut new_allocator); }
+      if !old_root.is_null() {
+        crate::ffi::ast_node_free(old_root as *mut AST_NODE_T, &mut old_allocator);
+      }
+
+      if !new_root.is_null() {
+        crate::ffi::ast_node_free(new_root as *mut AST_NODE_T, &mut new_allocator);
+      }
 
       crate::ffi::hb_allocator_destroy(&mut diff_allocator);
       crate::ffi::hb_allocator_destroy(&mut old_allocator);

test/diff/diff_test.rb

@@ -296,11 +296,10 @@ class DiffTest < Minitest::Spec
     test "DiffResult#each yields operations" do
       result = Herb.diff("<div>Hello</div>", "<div>World</div>")
 
-      operations = []
-      result.each { |op| operations << op }
+      count = 0
+      result.each { count += 1 }
 
-      assert_equal result.operations.size, operations.size
-      assert_equal result.operations[0], operations[0]
+      assert_equal result.operations.size, count
     end
 
     test "DiffResult#each returns enumerator without block" do