Chore: use actual type names in vortex-vector (#5167)

Imo this is more readable when using associated types

Signed-off-by: Connor Tsui <[email protected]>

Author: connortsui20

vortex-vector/src/binaryview/vector.rs

@@ -38,7 +38,7 @@ impl<T: BinaryViewType> BinaryViewVector<T> {
     /// components.
     ///
     /// The caller must uphold all validation that would otherwise be validated by
-    /// the [safe constructor][Self::try_new].
+    /// the [safe constructor](Self::try_new).
     pub unsafe fn new_unchecked(
         views: Buffer<BinaryView>,
         buffers: Arc<Box<[ByteBuffer]>>,
@@ -60,8 +60,8 @@ impl<T: BinaryViewType> BinaryViewVector<T> {
     ///
     /// # Errors
     ///
-    /// This function will panic if any of the validation checks performed by [`try_new`][Self::try_new]
-    /// fails.
+    /// This function will panic if any of the validation checks performed by
+    /// [`try_new`](Self::try_new) fails.
     pub fn new(views: Buffer<BinaryView>, buffers: Arc<Box<[ByteBuffer]>>, validity: Mask) -> Self {
         Self::try_new(views, buffers, validity).vortex_expect("Failed to create `BinaryViewVector`")
     }
@@ -153,7 +153,7 @@ impl<T: BinaryViewType> VectorOps for BinaryViewVector<T> {
         &self.validity
     }
 
-    fn try_into_mut(self) -> Result<Self::Mutable, Self>
+    fn try_into_mut(self) -> Result<BinaryViewVectorMut<T>, Self>
     where
         Self: Sized,
     {

vortex-vector/src/binaryview/vector_mut.rs

@@ -166,7 +166,7 @@ impl<T: BinaryViewType> VectorMutOps for BinaryViewVectorMut<T> {
         self.validity.reserve(additional);
     }
 
-    fn extend_from_vector(&mut self, other: &Self::Immutable) {
+    fn extend_from_vector(&mut self, other: &BinaryViewVector<T>) {
         // Close any existing views into a new buffer
         if let Some(open) = self.open_buffer.take() {
             self.buffers.push(open.freeze());
@@ -195,7 +195,7 @@ impl<T: BinaryViewType> VectorMutOps for BinaryViewVectorMut<T> {
         self.validity.append_n(false, n);
     }
 
-    fn freeze(mut self) -> Self::Immutable {
+    fn freeze(mut self) -> BinaryViewVector<T> {
         // Freeze all components, close any in-progress views
         if let Some(open) = self.open_buffer.take() {
             self.buffers.push(open.freeze());

vortex-vector/src/bool/vector.rs

@@ -83,7 +83,7 @@ impl VectorOps for BoolVector {
         &self.validity
     }
 
-    fn try_into_mut(self) -> Result<Self::Mutable, Self>
+    fn try_into_mut(self) -> Result<BoolVectorMut, Self>
     where
         Self: Sized,
     {

vortex-vector/src/bool/vector_mut.rs

@@ -152,7 +152,7 @@ impl VectorMutOps for BoolVectorMut {
         self.validity.append_n(false, n);
     }
 
-    fn freeze(self) -> Self::Immutable {
+    fn freeze(self) -> BoolVector {
         BoolVector {
             bits: self.bits.freeze(),
             validity: self.validity.freeze(),

vortex-vector/src/decimal/generic.rs

@@ -97,7 +97,7 @@ impl<D: NativeDecimalType> VectorOps for DVector<D> {
         &self.validity
     }
 
-    fn try_into_mut(self) -> Result<Self::Mutable, Self>
+    fn try_into_mut(self) -> Result<DVectorMut<D>, Self>
     where
         Self: Sized,
     {

vortex-vector/src/decimal/generic_mut.rs

@@ -31,7 +31,7 @@ impl<D: NativeDecimalType> VectorMutOps for DVectorMut<D> {
         self.validity.reserve(additional);
     }
 
-    fn extend_from_vector(&mut self, other: &Self::Immutable) {
+    fn extend_from_vector(&mut self, other: &DVector<D>) {
         self.elements.extend_from_slice(&other.elements);
         self.validity.append_mask(other.validity());
     }
@@ -41,7 +41,7 @@ impl<D: NativeDecimalType> VectorMutOps for DVectorMut<D> {
         self.validity.append_n(false, n);
     }
 
-    fn freeze(self) -> Self::Immutable {
+    fn freeze(self) -> DVector<D> {
         DVector {
             ps: self.ps,
             elements: self.elements.freeze(),

vortex-vector/src/decimal/vector.rs

@@ -36,7 +36,7 @@ impl VectorOps for DecimalVector {
         match_each_dvector!(self, |v| { v.validity() })
     }
 
-    fn try_into_mut(self) -> Result<Self::Mutable, Self>
+    fn try_into_mut(self) -> Result<DecimalVectorMut, Self>
     where
         Self: Sized,
     {

vortex-vector/src/decimal/vector_mut.rs

@@ -39,7 +39,7 @@ impl VectorMutOps for DecimalVectorMut {
         match_each_dvector_mut!(self, |d| { d.reserve(additional) })
     }
 
-    fn extend_from_vector(&mut self, other: &Self::Immutable) {
+    fn extend_from_vector(&mut self, other: &DecimalVector) {
         match (self, other) {
             (DecimalVectorMut::D8(s), DecimalVector::D8(o)) => s.extend_from_vector(o),
             (DecimalVectorMut::D16(s), DecimalVector::D16(o)) => s.extend_from_vector(o),
@@ -55,7 +55,7 @@ impl VectorMutOps for DecimalVectorMut {
         match_each_dvector_mut!(self, |d| { d.append_nulls(n) })
     }
 
-    fn freeze(self) -> Self::Immutable {
+    fn freeze(self) -> DecimalVector {
         match_each_dvector_mut!(self, |d| { d.freeze().into() })
     }
 

vortex-vector/src/null/vector.rs

@@ -43,7 +43,7 @@ impl VectorOps for NullVector {
         &self.validity
     }
 
-    fn try_into_mut(self) -> Result<Self::Mutable, Self>
+    fn try_into_mut(self) -> Result<NullVectorMut, Self>
     where
         Self: Sized,
     {

vortex-vector/src/null/vector_mut.rs

@@ -39,15 +39,15 @@ impl VectorMutOps for NullVectorMut {
         // We do not allocate memory for `NullVector`, so this is a no-op.
     }
 
-    fn extend_from_vector(&mut self, other: &Self::Immutable) {
+    fn extend_from_vector(&mut self, other: &NullVector) {
         self.len += other.len;
     }
 
     fn append_nulls(&mut self, n: usize) {
         self.len += n;
     }
 
-    fn freeze(self) -> Self::Immutable {
+    fn freeze(self) -> NullVector {
         NullVector::new(self.len)
     }