fix clippy for pyo3

Author: rescrv

rust/types/src/metadata.rs

@@ -233,7 +233,7 @@ impl<'py> pyo3::IntoPyObject<'py> for SparseVector {
     fn into_pyobject(self, py: pyo3::Python<'py>) -> Result<Self::Output, Self::Error> {
         use pyo3::types::PyDict;
 
-        let dict = PyDict::new_bound(py);
+        let dict = PyDict::new(py);
         dict.set_item("indices", self.indices)?;
         dict.set_item("values", self.values)?;
         dict.set_item("tokens", self.tokens)?;
@@ -247,20 +247,27 @@ impl<'py> pyo3::FromPyObject<'py> for SparseVector {
         use pyo3::types::PyDict;
 
         let dict = ob.downcast::<PyDict>()?;
-        let indices_obj = dict
-            .get_item("indices")?
-            .ok_or_else(|| pyo3::exceptions::PyKeyError::new_err("missing 'indices' key"))?;
-        let values_obj = dict
-            .get_item("values")?
-            .ok_or_else(|| pyo3::exceptions::PyKeyError::new_err("missing 'values' key"))?;
+        let indices_obj = dict.get_item("indices")?;
+        if indices_obj.is_none() {
+            return Err(pyo3::exceptions::PyKeyError::new_err(
+                "missing 'indices' key",
+            ));
+        }
+        let values_obj = dict.get_item("values")?;
+        if values_obj.is_none() {
+            return Err(pyo3::exceptions::PyKeyError::new_err(
+                "missing 'values' key",
+            ));
+        }
 
         let indices: Vec<u32> = indices_obj.extract()?;
         let values: Vec<f32> = values_obj.extract()?;
 
-        let tokens = match dict.get_item("tokens")? {
-            Some(item) if item.is_none() => None,
-            Some(item) => Some(item.extract::<Vec<String>>()?),
-            None => None,
+        let tokens_obj = dict.get_item("tokens")?;
+        let tokens = if tokens_obj.is_none() {
+            None
+        } else {
+            Some(tokens_obj.extract::<Vec<String>>()?)
         };
 
         Ok(SparseVector::new(indices, values, tokens))
@@ -2438,7 +2445,7 @@ mod tests {
             use pyo3::types::PyDict;
             use pyo3::IntoPyObject;
 
-            let dict_in = PyDict::new_bound(py);
+            let dict_in = PyDict::new(py);
             dict_in.set_item("indices", vec![0u32, 1, 2]).unwrap();
             dict_in
                 .set_item("values", vec![0.1f32, 0.2f32, 0.3f32])
@@ -2461,10 +2468,8 @@ mod tests {
 
             let py_obj = sparse.clone().into_pyobject(py).unwrap();
             let dict_out = py_obj.downcast::<PyDict>().unwrap();
-            let tokens_obj = dict_out
-                .get_item("tokens")
-                .unwrap()
-                .expect("expected tokens key in Python dict");
+            let tokens_obj = dict_out.get_item("tokens").unwrap();
+            assert!(!tokens_obj.is_none(), "expected tokens key in Python dict");
             let tokens: Vec<String> = tokens_obj.extract().unwrap();
             assert_eq!(
                 tokens,
@@ -2480,7 +2485,7 @@ mod tests {
             use pyo3::types::PyDict;
             use pyo3::IntoPyObject;
 
-            let dict_in = PyDict::new_bound(py);
+            let dict_in = PyDict::new(py);
             dict_in.set_item("indices", vec![5u32]).unwrap();
             dict_in.set_item("values", vec![1.5f32]).unwrap();
 
@@ -2491,10 +2496,8 @@ mod tests {
 
             let py_obj = sparse.into_pyobject(py).unwrap();
             let dict_out = py_obj.downcast::<PyDict>().unwrap();
-            match dict_out.get_item("tokens").unwrap() {
-                Some(obj) => assert!(obj.is_none()),
-                None => panic!("expected tokens key in Python dict"),
-            }
+            let tokens_obj = dict_out.get_item("tokens").unwrap();
+            assert!(tokens_obj.is_none(), "expected tokens to be None");
         });
     }