(arrow-datafusion) branch main updated: Minor: reduce unwraps in datetime_expressions.rs (#9072)

[alamb]

This is an automated email from the ASF dual-hosted git repository.

alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git


The following commit(s) were added to refs/heads/main by this push:
     new 47809d9bb4 Minor: reduce unwraps in datetime_expressions.rs (#9072)
47809d9bb4 is described below

commit 47809d9bb4efe206cf2635791e0c1ed040c2413e
Author: Andrew Lamb <and...@nerdnetworks.org>
AuthorDate: Wed Jan 31 11:37:40 2024 -0500

    Minor: reduce unwraps in datetime_expressions.rs (#9072)
---
 datafusion/physical-expr/src/datetime_expressions.rs | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/datafusion/physical-expr/src/datetime_expressions.rs 
b/datafusion/physical-expr/src/datetime_expressions.rs
index 4bf1c2cd03..5e4e601096 100644
--- a/datafusion/physical-expr/src/datetime_expressions.rs
+++ b/datafusion/physical-expr/src/datetime_expressions.rs
@@ -557,30 +557,25 @@ pub fn make_date(args: &[ColumnarValue]) -> 
Result<ColumnarValue> {
         let m = u32::try_from(value_fn(&months, i)?);
         let d = u32::try_from(value_fn(&days, i)?);
 
-        if m.is_err() {
+        let Ok(m) = m else {
             return exec_err!(
                 "Month value '{:?}' is out of range",
                 value_fn(&months, i).unwrap()
             );
-        }
-        if d.is_err() {
+        };
+
+        let Ok(d) = d else {
             return exec_err!(
                 "Day value '{:?}' is out of range",
                 value_fn(&days, i).unwrap()
             );
-        }
+        };
 
-        let date = NaiveDate::from_ymd_opt(y, m.unwrap(), d.unwrap());
+        let date = NaiveDate::from_ymd_opt(y, m, d);
 
         match date {
             Some(d) => builder.append_value(d.num_days_from_ce() - 
unix_days_from_ce),
-            None => {
-                return exec_err!(
-                    "Unable to parse date from {y}, {}, {}",
-                    m.unwrap(),
-                    d.unwrap()
-                )
-            }
+            None => return exec_err!("Unable to parse date from {y}, {m}, 
{d}"),
         };
     }