Use ptr::default in Rust 1.88 (#3896)

Signed-off-by: Nicholas Gates <[email protected]>

Author: gatesn

Cargo.toml

@@ -50,7 +50,7 @@ keywords = ["vortex"]
 license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/spiraldb/vortex"
-rust-version = "1.87"
+rust-version = "1.88"
 version = "0.1.0"
 
 [workspace.dependencies]

vortex-ffi/src/array.rs

@@ -3,15 +3,14 @@
 
 //! FFI interface for working with Vortex Arrays.
 use std::ffi::{c_int, c_void};
-use std::ptr;
 
 use vortex::dtype::half::f16;
 use vortex::error::{VortexExpect, VortexUnwrap, vortex_err};
 use vortex::{Array, ToCanonical};
 
 use crate::arc_dyn_wrapper;
 use crate::dtype::vx_dtype;
-use crate::error::{try_or, vx_error};
+use crate::error::{try_or_default, vx_error};
 
 arc_dyn_wrapper!(
     /// Base type for all Vortex arrays.
@@ -47,7 +46,7 @@ pub unsafe extern "C-unwind" fn vx_array_get_field(
     index: u32,
     error_out: *mut *mut vx_error,
 ) -> *const vx_array {
-    try_or(error_out, ptr::null(), || {
+    try_or_default(error_out, || {
         let array = vx_array::as_ref(array);
 
         let field_array = array
@@ -69,7 +68,7 @@ pub unsafe extern "C-unwind" fn vx_array_slice(
     error_out: *mut *mut vx_error,
 ) -> *const vx_array {
     let array = vx_array::as_ref(array);
-    try_or(error_out, ptr::null_mut(), || {
+    try_or_default(error_out, || {
         let sliced = array.slice(start as usize, stop as usize)?;
         Ok(vx_array::new(sliced))
     })
@@ -82,7 +81,7 @@ pub unsafe extern "C-unwind" fn vx_array_is_null(
     error_out: *mut *mut vx_error,
 ) -> bool {
     let array = vx_array::as_ref(array);
-    try_or(error_out, false, || array.is_invalid(index as usize))
+    try_or_default(error_out, || array.is_invalid(index as usize))
 }
 
 #[unsafe(no_mangle)]
@@ -91,7 +90,7 @@ pub unsafe extern "C-unwind" fn vx_array_null_count(
     error_out: *mut *mut vx_error,
 ) -> u32 {
     let array = vx_array::as_ref(array);
-    try_or(error_out, 0, || Ok(array.invalid_count()?.try_into()?))
+    try_or_default(error_out, || Ok(array.invalid_count()?.try_into()?))
 }
 
 macro_rules! ffiarray_get_ptype {

vortex-ffi/src/array_iterator.rs

@@ -7,7 +7,7 @@ use vortex::iter::ArrayIterator;
 
 use crate::array::vx_array;
 use crate::box_dyn_wrapper;
-use crate::error::{try_or, vx_error};
+use crate::error::{try_or_default, vx_error};
 
 box_dyn_wrapper!(
     /// A Vortex array iterator.
@@ -36,7 +36,7 @@ pub unsafe extern "C-unwind" fn vx_array_iterator_next(
     error_out: *mut *mut vx_error,
 ) -> *const vx_array {
     let iter = vx_array_iterator::as_mut(iter);
-    try_or(error_out, ptr::null_mut(), || {
+    try_or_default(error_out, || {
         let element = iter.next();
 
         if let Some(element) = element {

vortex-ffi/src/error.rs

@@ -20,9 +20,8 @@ box_wrapper!(
 );
 
 #[inline]
-pub fn try_or<T>(
+pub fn try_or_default<T: Default>(
     error_out: *mut *mut vx_error,
-    on_err: T,
     function: impl FnOnce() -> VortexResult<T>,
 ) -> T {
     match function() {
@@ -35,7 +34,7 @@ pub fn try_or<T>(
                 message: err.to_string().into(),
             }));
             unsafe { error_out.write(err) };
-            on_err
+            T::default()
         }
     }
 }

vortex-ffi/src/file.rs

@@ -5,9 +5,9 @@
 
 use std::ffi::{CStr, c_char, c_int, c_uint, c_ulong};
 use std::ops::Range;
+use std::slice;
 use std::str::FromStr;
 use std::sync::{Arc, LazyLock};
-use std::{ptr, slice};
 
 use itertools::Itertools;
 use object_store::aws::{AmazonS3Builder, AmazonS3ConfigKey};
@@ -28,7 +28,7 @@ use vortex::scan::ScanBuilder;
 use crate::array::vx_array;
 use crate::array_iterator::vx_array_iterator;
 use crate::dtype::vx_dtype;
-use crate::error::{try_or, vx_error};
+use crate::error::{try_or_default, vx_error};
 use crate::session::{FileKey, vx_session};
 use crate::{RUNTIME, arc_wrapper, to_string_vec};
 
@@ -139,7 +139,7 @@ pub unsafe extern "C-unwind" fn vx_file_open_reader(
 ) -> *const vx_file {
     let session = vx_session::as_ref(session);
 
-    try_or(error_out, ptr::null_mut(), || {
+    try_or_default(error_out, || {
         let options = unsafe {
             options
                 .as_ref()
@@ -189,7 +189,7 @@ pub unsafe extern "C-unwind" fn vx_file_write_array(
     error_out: *mut *mut vx_error,
 ) {
     let array = vx_array::as_ref(array);
-    try_or(error_out, (), || {
+    try_or_default(error_out, || {
         let path = unsafe { CStr::from_ptr(path).to_str()? };
 
         RUNTIME.block_on(async {
@@ -232,7 +232,7 @@ pub unsafe extern "C-unwind" fn vx_file_can_prune(
     filter_expression_len: c_uint,
     error_out: *mut *mut vx_error,
 ) -> bool {
-    try_or(error_out, false, || {
+    try_or_default(error_out, || {
         let file = vx_file::as_ref(file);
         let filter_expr = extract_expression(filter_expression, filter_expression_len)?;
         Ok(filter_expr
@@ -249,7 +249,7 @@ pub unsafe extern "C-unwind" fn vx_file_scan(
     opts: *const vx_file_scan_options,
     error_out: *mut *mut vx_error,
 ) -> *mut vx_array_iterator {
-    try_or(error_out, ptr::null_mut(), || {
+    try_or_default(error_out, || {
         let file = vx_file::as_ref(file);
 
         let scan_options = unsafe { opts.as_ref() }.map_or_else(

vortex-ffi/src/sink.rs

@@ -2,7 +2,6 @@
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
 use std::ffi::{CStr, c_char};
-use std::ptr;
 
 use mpsc::Sender;
 use tokio::fs::File;
@@ -17,7 +16,7 @@ use vortex::stream::ArrayStreamAdapter;
 use crate::RUNTIME;
 use crate::array::vx_array;
 use crate::dtype::vx_dtype;
-use crate::error::{try_or, vx_error};
+use crate::error::{try_or_default, vx_error};
 
 #[allow(non_camel_case_types)]
 /// The `sink` interface is used to collect array chunks and place them into a resource
@@ -35,7 +34,7 @@ pub unsafe extern "C-unwind" fn vx_array_sink_open_file(
     dtype: *const vx_dtype,
     error_out: *mut *mut vx_error,
 ) -> *mut vx_array_sink {
-    try_or(error_out, ptr::null_mut(), || {
+    try_or_default(error_out, || {
         let path = unsafe { path.as_ref() }.vortex_expect("null path");
         let path = unsafe { CStr::from_ptr(path) }
             .to_string_lossy()
@@ -66,7 +65,7 @@ pub unsafe extern "C-unwind" fn vx_array_sink_push(
 ) {
     let array = vx_array::as_ref(array);
     let sink = unsafe { sink.as_ref().vortex_expect("null array stream") };
-    try_or(error_out, (), || {
+    try_or_default(error_out, || {
         sink.sink
             .blocking_send(Ok(array.clone()))
             .map_err(|e| vortex_err!("send error {}", e.to_string()))
@@ -80,7 +79,7 @@ pub unsafe extern "C-unwind" fn vx_array_sink_close(
     sink: *mut vx_array_sink,
     error_out: *mut *mut vx_error,
 ) {
-    try_or(error_out, (), || {
+    try_or_default(error_out, || {
         let vx_array_sink { sink, writer } = *unsafe { Box::from_raw(sink) };
         drop(sink);