fix merge

Author: adriangb

datafusion/core/src/test_util/parquet.rs

@@ -187,7 +187,7 @@ impl TestParquetFile {
                 ParquetSource::new(parquet_options)
                     .with_predicate(Arc::clone(&physical_filter_expr)),
             )
-            .with_schema(TableSchema::new_from_file_schema(Arc::clone(&self.schema)));
+            .with_schema(TableSchema::from_file_schema(Arc::clone(&self.schema)));
             let config = scan_config_builder.with_source(source).build();
             let parquet_exec = DataSourceExec::from_data_source(config);
 

datafusion/datasource-csv/src/source.rs

@@ -260,7 +260,7 @@ impl FileSource for CsvSource {
 
     fn with_schema(&self, schema: TableSchema) -> Arc<dyn FileSource> {
         let mut conf = self.clone();
-        conf.file_schema = Some(Arc::clone(&schema.file_schema()));
+        conf.file_schema = Some(Arc::clone(schema.file_schema()));
         Arc::new(conf)
     }