Fix warnings - unnecessary casts and utilizing values method on iterator.

Author: curtisalexander

crates/readstat/src/rs_data.rs

@@ -340,7 +340,7 @@ impl ReadStatData {
             .set_row_offset(Some(self.chunk_row_start.try_into().unwrap()))?
             .parse_sas7bdat(ppath, ctx);
 
-        match FromPrimitive::from_i32(error as i32) {
+        match FromPrimitive::from_i32(error) {
             Some(ReadStatError::READSTAT_OK) => Ok(()),
             Some(e) => Err(From::from(format!(
                 "Error when attempting to parse sas7bdat: {:#?}",

crates/readstat/src/rs_metadata.rs

@@ -53,8 +53,8 @@ impl ReadStatMetadata {
         // build up Schema
         let fields: Vec<Field> = self
             .vars
-            .iter()
-            .map(|(_idx, vm)| {
+            .values()
+            .map(|vm| {
                 let var_dt = match &vm.var_type {
                     ReadStatVarType::String
                     | ReadStatVarType::StringRef
@@ -141,7 +141,7 @@ impl ReadStatMetadata {
         }
         */
 
-        match FromPrimitive::from_i32(error as i32) {
+        match FromPrimitive::from_i32(error) {
             Some(ReadStatError::READSTAT_OK) => {
                 // if successful, initialize schema
                 self.schema = self.initialize_schema();

crates/readstat/src/rs_parser.rs

@@ -31,7 +31,7 @@ impl ReadStatParser {
             &set_metadata_handler_error
         );
 
-        match FromPrimitive::from_i32(set_metadata_handler_error as i32) {
+        match FromPrimitive::from_i32(set_metadata_handler_error) {
             Some(ReadStatError::READSTAT_OK) => Ok(self),
             Some(e) => Err(From::from(format!(
                 "Unable to set metdata handler: {:#?}",
@@ -57,7 +57,7 @@ impl ReadStatParser {
                     &set_row_limit_error
                 );
 
-                match FromPrimitive::from_i32(set_row_limit_error as i32) {
+                match FromPrimitive::from_i32(set_row_limit_error) {
                     Some(ReadStatError::READSTAT_OK) => Ok(self),
                     Some(e) => Err(From::from(format!("Unable to set row limit: {:#?}", e))),
                     None => Err(From::from(
@@ -83,7 +83,7 @@ impl ReadStatParser {
                     &set_row_offset_error
                 );
 
-                match FromPrimitive::from_i32(set_row_offset_error as i32) {
+                match FromPrimitive::from_i32(set_row_offset_error) {
                     Some(ReadStatError::READSTAT_OK) => Ok(self),
                     Some(e) => Err(From::from(format!("Unable to set row limit: {:#?}", e))),
                     None => Err(From::from(
@@ -107,7 +107,7 @@ impl ReadStatParser {
             &set_variable_handler_error
         );
 
-        match FromPrimitive::from_i32(set_variable_handler_error as i32) {
+        match FromPrimitive::from_i32(set_variable_handler_error) {
             Some(ReadStatError::READSTAT_OK) => Ok(self),
             Some(e) => Err(From::from(format!(
                 "Unable to set variable handler: {:#?}",
@@ -131,7 +131,7 @@ impl ReadStatParser {
             &set_value_handler_error
         );
 
-        match FromPrimitive::from_i32(set_value_handler_error as i32) {
+        match FromPrimitive::from_i32(set_value_handler_error) {
             Some(ReadStatError::READSTAT_OK) => Ok(self),
             Some(e) => Err(From::from(format!("Unable to set value handler: {:#?}", e))),
             None => Err(From::from(

crates/readstat/src/rs_write.rs

@@ -644,7 +644,7 @@ impl ReadStatWriter {
             let mut f = std::fs::File::create(p)?;
 
             // Get variable names
-            let vars: Vec<String> = d.vars.iter().map(|(_, m)| m.var_name.clone()).collect();
+            let vars: Vec<String> = d.vars.values().map(|m| m.var_name.clone()).collect();
 
             // write
             let options = csv_arrow2::write::SerializeOptions::default();
@@ -671,7 +671,7 @@ impl ReadStatWriter {
         }
 
         // Get variable names
-        let vars: Vec<String> = d.vars.iter().map(|(_, m)| m.var_name.clone()).collect();
+        let vars: Vec<String> = d.vars.values().map(|m| m.var_name.clone()).collect();
 
         // write
         let options = csv_arrow2::write::SerializeOptions::default();