Merge branch 'main' into feat/public-ctor

Author: zachschuermann

acceptance/build.rs

@@ -29,8 +29,7 @@ fn dat_exists() -> bool {
 
 fn download_dat_files() -> Vec<u8> {
     let tarball_url = format!(
-        "https://github.com/delta-incubator/dat/releases/download/v{version}/deltalake-dat-v{version}.tar.gz",
-        version = VERSION
+        "https://github.com/delta-incubator/dat/releases/download/v{VERSION}/deltalake-dat-v{VERSION}.tar.gz"
     );
 
     let response = if let Ok(proxy_url) = env::var("HTTPS_PROXY") {

acceptance/src/meta.rs

@@ -147,6 +147,6 @@ mod tests {
         let path = PathBuf::from("./tests/dat/out/reader_tests/generated/with_schema_change");
         let case = read_dat_case(path).unwrap();
         let versions = case.versions().await.unwrap();
-        println!("{:?}", versions)
+        println!("{versions:?}")
     }
 }

acceptance/tests/dat_reader.rs

@@ -16,7 +16,7 @@ fn reader_test(path: &Path) -> datatest_stable::Result<()> {
     );
     for skipped in SKIPPED_TESTS {
         if root_dir.ends_with(skipped) {
-            println!("Skipping test: {}", skipped);
+            println!("Skipping test: {skipped}");
             return Ok(());
         }
     }

derive-macros/src/lib.rs

@@ -241,7 +241,7 @@ fn make_public(mut item: Item) -> Item {
         // foreign mod, impl block, and all others not handled
         _ => Err(Error::new(
             item.span(),
-            format!("unsupported item type for #[internal_api]: {:?}", item),
+            format!("unsupported item type for #[internal_api]: {item:?}"),
         )),
     };
 

ffi-proc-macros/src/lib.rs

@@ -56,7 +56,7 @@ impl Parse for HandleDescriptorParams {
                 field => {
                     return Err(Error::new(
                         ident.span(),
-                        format!("unknown or duplicated field `{}`", field),
+                        format!("unknown or duplicated field `{field}`"),
                     ));
                 }
             }

ffi/build.rs

@@ -26,7 +26,7 @@ fn main() {
 
     // generate cxx bindings
     let output_file_hpp = target_dir
-        .join(format!("{}.hpp", package_name))
+        .join(format!("{package_name}.hpp"))
         .display()
         .to_string();
     let mut config_hpp = config.clone();
@@ -37,7 +37,7 @@ fn main() {
 
     // generate c bindings
     let output_file_h = target_dir
-        .join(format!("{}.h", package_name))
+        .join(format!("{package_name}.h"))
         .display()
         .to_string();
     config.language = Language::C;

ffi/src/error.rs

@@ -214,7 +214,7 @@ impl<T> IntoExternResult<T> for DeltaResult<T> {
         match self {
             Ok(ok) => ExternResult::Ok(ok),
             Err(err) => {
-                let msg = format!("{}", err);
+                let msg = format!("{err}");
                 let err = unsafe { alloc.allocate_error(err.into(), kernel_string_slice!(msg)) };
                 ExternResult::Err(err)
             }

ffi/src/ffi_tracing.rs

@@ -230,7 +230,7 @@ struct MessageFieldVisitor {
 impl Visit for MessageFieldVisitor {
     fn record_debug(&mut self, field: &TracingField, value: &dyn fmt::Debug) {
         if field.name() == "message" {
-            self.message = Some(format!("{:?}", value));
+            self.message = Some(format!("{value:?}"));
         }
     }
 
@@ -577,7 +577,7 @@ mod tests {
 
         // file path will use \ on windows
         use std::path::MAIN_SEPARATOR;
-        let expected_file = format!("ffi{}src{}ffi_tracing.rs", MAIN_SEPARATOR, MAIN_SEPARATOR);
+        let expected_file = format!("ffi{MAIN_SEPARATOR}src{MAIN_SEPARATOR}ffi_tracing.rs");
 
         let ok = event.level == Level::INFO
             && target == "delta_kernel_ffi::ffi_tracing::tests"

ffi/tests/invalid-handle-code/mut-clone-handle.stderr

@@ -14,10 +14,16 @@ error[E0271]: type mismatch resolving `<MutFoo as HandleDescriptor>::Mutable ==
   --> tests/invalid-handle-code/mut-clone-handle.rs:12:41
    |
 12 |     let h: Handle<MutFoo> = Arc::new(s).into();
-   |                                         ^^^^ expected `False`, found `True`
+   |                                         ^^^^ type mismatch resolving `<MutFoo as HandleDescriptor>::Mutable == False`
    |
+note: expected this to be `False`
+  --> tests/invalid-handle-code/mut-clone-handle.rs:7:1
+   |
+7  | #[handle_descriptor(target=Foo, mutable=true, sized=true)]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: required for `Handle<MutFoo>` to implement `From<Arc<Foo>>`
    = note: required for `Arc<Foo>` to implement `Into<Handle<MutFoo>>`
+   = note: this error originates in the attribute macro `handle_descriptor` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: the method `clone_handle` exists for struct `Handle<MutFoo>`, but its trait bounds were not satisfied
   --> tests/invalid-handle-code/mut-clone-handle.rs:14:15

ffi/tests/invalid-handle-code/shared-as-mut.stderr

@@ -14,7 +14,13 @@ error[E0271]: type mismatch resolving `<SharedFoo as HandleDescriptor>::Mutable
   --> tests/invalid-handle-code/shared-as-mut.rs:11:44
    |
 11 |     let h: Handle<SharedFoo> = Box::new(s).into();
-   |                                            ^^^^ expected `True`, found `False`
+   |                                            ^^^^ type mismatch resolving `<SharedFoo as HandleDescriptor>::Mutable == True`
    |
+note: expected this to be `True`
+  --> tests/invalid-handle-code/shared-as-mut.rs:6:1
+   |
+6  | #[handle_descriptor(target=Foo, mutable=false, sized=true)]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: required for `Handle<SharedFoo>` to implement `From<Box<Foo>>`
    = note: required for `Box<Foo>` to implement `Into<Handle<SharedFoo>>`
+   = note: this error originates in the attribute macro `handle_descriptor` (in Nightly builds, run with -Z macro-backtrace for more info)