fix: move instead of clone

Author: indietyp

libs/@local/hashql/core/src/heap/convert.rs

@@ -2,7 +2,7 @@
 
 use core::alloc::Allocator;
 
-use super::CloneIn as _;
+use super::CollectIn as _;
 
 /// Construct a value of type `Self` from `T` using the provided allocator.
 ///
@@ -48,10 +48,10 @@ impl<T, A: Allocator> FromIn<T, A> for Box<T, A> {
 impl<A: Allocator> FromIn<String, A> for Box<str, A> {
     fn from_in(value: String, allocator: A) -> Self {
         // This is the same `as_boxed_str`, but with custom allocator support.
-        let bytes = value.into_bytes().clone_in(allocator).into_boxed_slice();
+        let bytes: Vec<u8, A> = value.into_bytes().into_iter().collect_in(allocator);
 
         // This is the same as `from_boxed_utf8_unchecked` but with a custom allocator.
-        let (ptr, alloc) = Box::into_raw_with_allocator(bytes);
+        let (ptr, alloc) = Box::into_raw_with_allocator(bytes.into_boxed_slice());
 
         // SAFETY: The bytes are guaranteed to be valid UTF-8 because they come from a String.
         unsafe { Self::from_raw_in(ptr as *mut str, alloc) }

libs/@local/hashql/core/src/heap/iter.rs

@@ -13,6 +13,7 @@ pub trait FromIteratorIn<T, A: Allocator> {
 }
 
 impl<T, A: Allocator> FromIteratorIn<T, A> for Vec<T, A> {
+    #[inline]
     fn from_iter_in<I>(iter: I, alloc: A) -> Self
     where
         I: IntoIterator<Item = T>,
@@ -36,6 +37,7 @@ impl<I, C: FromIteratorIn<T, A>, T, A: Allocator> CollectIn<C, A> for I
 where
     I: IntoIterator<Item = T>,
 {
+    #[inline]
     fn collect_in(self, alloc: A) -> C {
         C::from_iter_in(self, alloc)
     }

libs/@local/hashql/syntax-jexpr/src/parser/array/mod.rs

@@ -9,7 +9,7 @@ use hashql_ast::node::{
     id::NodeId,
     path::{Path, PathSegment},
 };
-use hashql_core::heap::CloneIn as _;
+use hashql_core::heap::CollectIn as _;
 
 use self::{
     error::{
@@ -236,8 +236,8 @@ pub(crate) fn parse_array<'heap, 'source>(
             id: NodeId::PLACEHOLDER,
             span,
             function: Box::new_in(function, heap),
-            arguments: arguments.clone_in(heap),
-            labeled_arguments: labeled_arguments.clone_in(heap),
+            arguments: arguments.into_iter().collect_in(heap),
+            labeled_arguments: labeled_arguments.into_iter().collect_in(heap),
         }),
     })
 }

libs/@local/hashql/syntax-jexpr/src/parser/object/dict.rs

@@ -3,7 +3,7 @@ use hashql_ast::node::{
     id::NodeId,
 };
 use hashql_core::{
-    heap::CloneIn as _,
+    heap::CollectIn as _,
     value::{self, Primitive},
 };
 use text_size::TextRange;
@@ -117,7 +117,7 @@ fn parse_dict_object<'heap, 'source>(
     Ok(DictExpr {
         id: NodeId::PLACEHOLDER,
         span: state.insert_range(span),
-        entries: entries.clone_in(state.heap()),
+        entries: entries.into_iter().collect_in(state.heap()),
         r#type: None,
     })
 }
@@ -191,7 +191,7 @@ fn parse_dict_array<'heap, 'source>(
     Ok(DictExpr {
         id: NodeId::PLACEHOLDER,
         span: state.insert_range(span),
-        entries: entries.clone_in(state.heap()),
+        entries: entries.into_iter().collect_in(state.heap()),
         r#type: None,
     })
 }

libs/@local/hashql/syntax-jexpr/src/parser/object/list.rs

@@ -2,7 +2,7 @@ use hashql_ast::node::{
     expr::{Expr, ExprKind, ListExpr, list::ListElement},
     id::NodeId,
 };
-use hashql_core::heap::CloneIn as _;
+use hashql_core::heap::CollectIn as _;
 use text_size::TextRange;
 
 use super::{
@@ -107,7 +107,7 @@ fn parse_list<'heap>(
     Ok(ListExpr {
         id: NodeId::PLACEHOLDER,
         span: state.insert_range(range),
-        elements: elements.clone_in(state.heap()),
+        elements: elements.into_iter().collect_in(state.heap()),
         r#type: None,
     })
 }

libs/@local/hashql/syntax-jexpr/src/parser/object/struct.rs

@@ -2,7 +2,7 @@ use hashql_ast::node::{
     expr::{Expr, ExprKind, StructExpr, r#struct::StructEntry},
     id::NodeId,
 };
-use hashql_core::heap::CloneIn as _;
+use hashql_core::heap::CollectIn as _;
 use text_size::TextRange;
 
 use super::{
@@ -124,7 +124,7 @@ fn parse_struct<'heap>(
     Ok(StructExpr {
         id: NodeId::PLACEHOLDER,
         span: state.insert_range(span),
-        entries: entries.clone_in(state.heap()),
+        entries: entries.into_iter().collect_in(state.heap()),
         r#type: None,
     })
 }

libs/@local/hashql/syntax-jexpr/src/parser/object/tuple.rs

@@ -2,7 +2,7 @@ use hashql_ast::node::{
     expr::{Expr, ExprKind, TupleExpr, tuple::TupleElement},
     id::NodeId,
 };
-use hashql_core::heap::CloneIn as _;
+use hashql_core::heap::CollectIn as _;
 use text_size::TextRange;
 
 use super::{
@@ -107,7 +107,7 @@ fn parse_tuple<'heap>(
     Ok(TupleExpr {
         id: NodeId::PLACEHOLDER,
         span: state.insert_range(range),
-        elements: elements.clone_in(state.heap()),
+        elements: elements.into_iter().collect_in(state.heap()),
         r#type: None,
     })
 }

libs/@local/hashql/syntax-jexpr/src/parser/string/type.rs

@@ -6,7 +6,7 @@ use hashql_ast::node::{
         IntersectionType, StructField, StructType, TupleField, TupleType, Type, TypeKind, UnionType,
     },
 };
-use hashql_core::{heap::CloneIn as _, symbol::Ident};
+use hashql_core::{heap::CollectIn as _, symbol::Ident};
 use winnow::{
     ModalParser, ModalResult, Parser as _,
     ascii::multispace0,
@@ -184,7 +184,7 @@ where
             kind: TypeKind::Struct(StructType {
                 id: NodeId::PLACEHOLDER,
                 span,
-                fields: fields.clone_in(input.state.heap),
+                fields: fields.into_iter().collect_in(input.state.heap),
             }),
         })
     }
@@ -237,7 +237,7 @@ where
             kind: TypeKind::Tuple(TupleType {
                 id: NodeId::PLACEHOLDER,
                 span,
-                fields: fields.clone_in(input.state.heap),
+                fields: fields.into_iter().collect_in(input.state.heap),
             }),
         })
     }