Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions rust/arrow-flight/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ license = "Apache-2.0"

[dependencies]
arrow = { path = "../arrow", version = "2.0.0-SNAPSHOT" }
tonic = "0.2"
tonic = "0.3"
bytes = "0.5"
prost = "0.6"
prost-derive = "0.6"
tokio = {version = "0.2", features = ["macros"]}
futures = { version = "0.3", default-features = false, features = ["alloc"]}

[build-dependencies]
tonic-build = "0.2"
tonic-build = "0.3"
# Pin specific version of the tonic-build dependencies to avoid auto-generated
# (and checked in) arrow.flight.protocol.rs from changing
proc-macro2 = "=1.0.18"
proc-macro2 = "=1.0.24"

#[lib]
#name = "flight"
Expand Down
20 changes: 10 additions & 10 deletions rust/arrow-flight/src/arrow.flight.protocol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,6 @@ pub mod flight_service_server {
#[doc = " accessed using the Arrow Flight Protocol. Additionally, a flight service"]
#[doc = " can expose a set of actions that are available."]
#[derive(Debug)]
#[doc(hidden)]
pub struct FlightServiceServer<T: FlightService> {
inner: _Inner<T>,
}
Expand Down Expand Up @@ -687,7 +686,7 @@ pub mod flight_service_server {
>,
) -> Self::Future {
let inner = self.0.clone();
let fut = async move { inner.handshake(request).await };
let fut = async move { (*inner).handshake(request).await };
Box::pin(fut)
}
}
Expand Down Expand Up @@ -725,7 +724,7 @@ pub mod flight_service_server {
request: tonic::Request<super::Criteria>,
) -> Self::Future {
let inner = self.0.clone();
let fut = async move { inner.list_flights(request).await };
let fut = async move { (*inner).list_flights(request).await };
Box::pin(fut)
}
}
Expand Down Expand Up @@ -760,7 +759,8 @@ pub mod flight_service_server {
request: tonic::Request<super::FlightDescriptor>,
) -> Self::Future {
let inner = self.0.clone();
let fut = async move { inner.get_flight_info(request).await };
let fut =
async move { (*inner).get_flight_info(request).await };
Box::pin(fut)
}
}
Expand Down Expand Up @@ -795,7 +795,7 @@ pub mod flight_service_server {
request: tonic::Request<super::FlightDescriptor>,
) -> Self::Future {
let inner = self.0.clone();
let fut = async move { inner.get_schema(request).await };
let fut = async move { (*inner).get_schema(request).await };
Box::pin(fut)
}
}
Expand Down Expand Up @@ -833,7 +833,7 @@ pub mod flight_service_server {
request: tonic::Request<super::Ticket>,
) -> Self::Future {
let inner = self.0.clone();
let fut = async move { inner.do_get(request).await };
let fut = async move { (*inner).do_get(request).await };
Box::pin(fut)
}
}
Expand Down Expand Up @@ -871,7 +871,7 @@ pub mod flight_service_server {
request: tonic::Request<tonic::Streaming<super::FlightData>>,
) -> Self::Future {
let inner = self.0.clone();
let fut = async move { inner.do_put(request).await };
let fut = async move { (*inner).do_put(request).await };
Box::pin(fut)
}
}
Expand Down Expand Up @@ -909,7 +909,7 @@ pub mod flight_service_server {
request: tonic::Request<tonic::Streaming<super::FlightData>>,
) -> Self::Future {
let inner = self.0.clone();
let fut = async move { inner.do_exchange(request).await };
let fut = async move { (*inner).do_exchange(request).await };
Box::pin(fut)
}
}
Expand Down Expand Up @@ -947,7 +947,7 @@ pub mod flight_service_server {
request: tonic::Request<super::Action>,
) -> Self::Future {
let inner = self.0.clone();
let fut = async move { inner.do_action(request).await };
let fut = async move { (*inner).do_action(request).await };
Box::pin(fut)
}
}
Expand Down Expand Up @@ -985,7 +985,7 @@ pub mod flight_service_server {
request: tonic::Request<super::Empty>,
) -> Self::Future {
let inner = self.0.clone();
let fut = async move { inner.list_actions(request).await };
let fut = async move { (*inner).list_actions(request).await };
Box::pin(fut)
}
}
Expand Down
4 changes: 2 additions & 2 deletions rust/arrow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ path = "src/lib.rs"
serde = { version = "1.0", features = ["rc"] }
serde_derive = "1.0"
serde_json = { version = "1.0", features = ["preserve_order"] }
indexmap = "1.4"
indexmap = "1.6"
rand = "0.7"
csv = "1.1"
num = "0.3"
regex = "1.3"
lazy_static = "1.4"
packed_simd = { version = "0.3", optional = true }
packed_simd = { version = "0.3.4", optional = true, package = "packed_simd_2" }
chrono = "0.4"
flatbuffers = "0.6"
hex = "0.4"
Expand Down
4 changes: 2 additions & 2 deletions rust/datafusion/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ crossbeam = "0.7"
paste = "0.1"
num_cpus = "1.13.0"
chrono = "0.4"
async-trait = "0.1.36"
async-trait = "0.1.41"
tokio = { version = "0.2", features = ["macros", "rt-core", "rt-threaded"] }

[dev-dependencies]
Expand All @@ -64,7 +64,7 @@ tempfile = "3"
futures = "0.3"
prost = "0.6"
arrow-flight = { path = "../arrow-flight", version = "2.0.0-SNAPSHOT" }
tonic = "0.2"
tonic = "0.3"

[[bench]]
name = "aggregate_query_sql"
Expand Down
6 changes: 3 additions & 3 deletions rust/parquet_derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ bigdecimal = []
uuid = []

[dependencies]
proc-macro2 = "1.0.8"
quote = "1.0.2"
syn = { version = "1.0.14", features = ["full", "extra-traits"] }
proc-macro2 = "1.0"
quote = "1.0"
syn = { version = "1.0", features = ["full", "extra-traits"] }
parquet = { path = "../parquet", version = "2.0.0-SNAPSHOT" }
2 changes: 1 addition & 1 deletion rust/parquet_derive/src/parquet_field.rs
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ mod test {
"u8",
"bool",
"std :: string :: String",
"std :: result :: Result < ( ) , ( ) >"
"std :: result :: Result < () , () >"
]
)
}
Expand Down