clippy suggestions

Author: nikhilsinhaparseable

src/catalog/mod.rs

@@ -16,7 +16,7 @@
  *
  */
 
-use std::{io::ErrorKind, sync::Arc};
+use std::sync::Arc;
 
 use chrono::{DateTime, Local, NaiveTime, Utc};
 use column::Column;
@@ -259,10 +259,7 @@ async fn create_manifest(
         .date_naive()
         .and_time(
             NaiveTime::from_num_seconds_from_midnight_opt(23 * 3600 + 59 * 60 + 59, 999_999_999)
-                .ok_or(IOError::new(
-                    ErrorKind::Other,
-                    "Failed to create upper bound for manifest",
-                ))?,
+                .ok_or(IOError::other("Failed to create upper bound for manifest"))?,
         )
         .and_utc();
 

src/handlers/airplane.rs

@@ -126,9 +126,11 @@ impl FlightService for AirServiceImpl {
     }
 
     async fn do_get(&self, req: Request<Ticket>) -> Result<Response<Self::DoGetStream>, Status> {
-        let key = extract_session_key(req.metadata())?;
+        let key = extract_session_key(req.metadata())
+            .map_err(|e| Status::unauthenticated(e.to_string()))?;
 
-        let ticket = get_query_from_ticket(&req)?;
+        let ticket =
+            get_query_from_ticket(&req).map_err(|e| Status::invalid_argument(e.to_string()))?;
 
         info!("query requested to airplane: {:?}", ticket);
 
@@ -246,7 +248,7 @@ impl FlightService for AirServiceImpl {
             .observe(time);
 
         // Airplane takes off 🛫
-        out
+        out.map_err(|e| *e)
     }
 
     async fn do_put(

src/handlers/livetail.rs

@@ -98,10 +98,10 @@ impl FlightService for FlightServiceImpl {
     }
 
     async fn do_get(&self, req: Request<Ticket>) -> Result<Response<Self::DoGetStream>, Status> {
-        let key = extract_session_key(req.metadata())?;
+        let key = extract_session_key(req.metadata()).map_err(|e| *e)?;
         let ticket: serde_json::Value = serde_json::from_slice(&req.into_inner().ticket)
             .map_err(|err| Status::internal(err.to_string()))?;
-        let stream = extract_stream(&ticket)?;
+        let stream = extract_stream(&ticket).map_err(|e| *e)?;
         info!("livetail requested for stream {}", stream);
         match Users.authorize(key, rbac::role::Action::Query, Some(stream), None) {
             rbac::Response::Authorized => (),
@@ -232,16 +232,16 @@ pub fn server() -> impl Future<Output = Result<(), Box<dyn std::error::Error + S
     }
 }
 
-pub fn extract_stream(body: &serde_json::Value) -> Result<&str, Status> {
+pub fn extract_stream(body: &serde_json::Value) -> Result<&str, Box<Status>> {
     body.as_object()
-        .ok_or(Status::invalid_argument("expected object in request body"))?
+        .ok_or_else(|| Box::new(Status::invalid_argument("expected object in request body")))?
         .get("stream")
-        .ok_or(Status::invalid_argument("stream key value is not provided"))?
+        .ok_or_else(|| Box::new(Status::invalid_argument("stream key value is not provided")))?
         .as_str()
-        .ok_or(Status::invalid_argument("stream key value is invalid"))
+        .ok_or_else(|| Box::new(Status::invalid_argument("stream key value is invalid")))
 }
 
-pub fn extract_session_key(headers: &MetadataMap) -> Result<SessionKey, Status> {
+pub fn extract_session_key(headers: &MetadataMap) -> Result<SessionKey, Box<Status>> {
     // Extract username and password from the request using basic auth extractor.
     let basic = extract_basic_auth(headers).map(|creds| SessionKey::BasicAuth {
         username: creds.user_id,
@@ -261,7 +261,9 @@ pub fn extract_session_key(headers: &MetadataMap) -> Result<SessionKey, Status>
         return Ok(SessionKey::SessionId(session));
     }
 
-    Err(Status::unauthenticated("No authentication method supplied"))
+    Err(Box::new(Status::unauthenticated(
+        "No authentication method supplied",
+    )))
 }
 
 fn extract_basic_auth(header: &MetadataMap) -> Option<Credentials> {

src/utils/arrow/flight.rs

@@ -41,9 +41,9 @@ use tonic::transport::{Channel, Uri};
 
 pub type DoGetStream = stream::BoxStream<'static, Result<FlightData, Status>>;
 
-pub fn get_query_from_ticket(req: &Request<Ticket>) -> Result<QueryJson, Status> {
+pub fn get_query_from_ticket(req: &Request<Ticket>) -> Result<QueryJson, Box<Status>> {
     serde_json::from_slice::<QueryJson>(&req.get_ref().ticket)
-        .map_err(|err| Status::internal(err.to_string()))
+        .map_err(|err| Box::new(Status::internal(err.to_string())))
 }
 
 pub async fn run_do_get_rpc(
@@ -141,7 +141,7 @@ fn lit_timestamp_milli(time: i64) -> Expr {
     Expr::Literal(ScalarValue::TimestampMillisecond(Some(time), None))
 }
 
-pub fn into_flight_data(records: Vec<RecordBatch>) -> Result<Response<DoGetStream>, Status> {
+pub fn into_flight_data(records: Vec<RecordBatch>) -> Result<Response<DoGetStream>, Box<Status>> {
     let input_stream = futures::stream::iter(records.into_iter().map(Ok));
     let write_options = IpcWriteOptions::default()
         .try_with_compression(Some(arrow_ipc::CompressionType(1)))