@@ -10,22 +10,22 @@ use object_store::{
1010use pyo3:: pybacked:: PyBackedStr ;
1111#[ cfg( feature = "async" ) ]
1212use pyo3_object_store:: AnyObjectStore ;
13- use sync:: FileReader ;
13+ use sync:: SyncReader ;
1414
1515use pyo3:: prelude:: * ;
1616use url:: Url ;
1717
1818#[ cfg( feature = "async" ) ]
1919#[ derive( Debug , Clone ) ]
20- pub struct AsyncFileReader {
20+ pub struct AsyncReader {
2121 pub store : Arc < dyn ObjectStore > ,
2222 pub path : Path ,
2323}
2424
2525pub enum AnyFileReader {
26- Sync ( FileReader ) ,
26+ Sync ( SyncReader ) ,
2727 #[ cfg( feature = "async" ) ]
28- Async ( AsyncFileReader ) ,
28+ Async ( AsyncReader ) ,
2929}
3030
3131/// Construct a reader for the user that will always be asynchronous
@@ -36,12 +36,12 @@ pub enum AnyFileReader {
3636pub fn construct_async_reader (
3737 file : Bound < PyAny > ,
3838 store : Option < Bound < PyAny > > ,
39- ) -> PyGeoArrowResult < AsyncFileReader > {
39+ ) -> PyGeoArrowResult < AsyncReader > {
4040 // If the user passed an object store instance, use that
4141
4242 use pyo3_object_store:: AnyObjectStore ;
4343 if let Some ( store) = store {
44- let async_reader = AsyncFileReader {
44+ let async_reader = AsyncReader {
4545 store : store. extract :: < AnyObjectStore > ( ) ?. into ( ) ,
4646 path : file. extract :: < String > ( ) ?. into ( ) ,
4747 } ;
@@ -70,7 +70,7 @@ pub fn construct_reader(
7070 // If the user passed an object store instance, use that
7171 #[ cfg( feature = "async" ) ]
7272 if let Some ( store) = store {
73- let async_reader = AsyncFileReader {
73+ let async_reader = AsyncReader {
7474 store : store. extract :: < AnyObjectStore > ( ) ?. into ( ) ,
7575 path : file. extract :: < String > ( ) ?. into ( ) ,
7676 } ;
@@ -91,7 +91,7 @@ pub fn construct_reader(
9191
9292#[ allow( dead_code) ]
9393#[ cfg( feature = "async" ) ]
94- fn default_http_store ( path_or_url : & str ) -> PyGeoArrowResult < AsyncFileReader > {
94+ fn default_http_store ( path_or_url : & str ) -> PyGeoArrowResult < AsyncReader > {
9595 let url = Url :: parse ( path_or_url) ?;
9696
9797 let store_input = format ! ( "{}://{}" , url. scheme( ) , url. domain( ) . unwrap( ) ) ;
@@ -103,16 +103,16 @@ fn default_http_store(path_or_url: &str) -> PyGeoArrowResult<AsyncFileReader> {
103103 . build ( ) ?;
104104 let path = url. path ( ) . trim_start_matches ( '/' ) ;
105105
106- let async_reader = AsyncFileReader {
106+ let async_reader = AsyncReader {
107107 store : Arc :: new ( store) ,
108108 path : path. into ( ) ,
109109 } ;
110110 Ok ( async_reader)
111111}
112112
113113#[ cfg( feature = "async" ) ]
114- fn default_local_store ( path : & str ) -> PyGeoArrowResult < AsyncFileReader > {
115- let async_reader = AsyncFileReader {
114+ fn default_local_store ( path : & str ) -> PyGeoArrowResult < AsyncReader > {
115+ let async_reader = AsyncReader {
116116 store : Arc :: new ( LocalFileSystem :: new ( ) ) ,
117117 path : path. into ( ) ,
118118 } ;
0 commit comments