Skip to content

Commit 26104b5

Browse files
Convert to i32
1 parent c285889 commit 26104b5

File tree

4 files changed

+34
-12
lines changed

4 files changed

+34
-12
lines changed

crates/readstat/src/cb.rs

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,26 @@ pub extern "C" fn handle_metadata(
5858
.expect("Panics (returns None) on the out-of-range number of seconds (more than 262 000 years away from common era) and/or invalid nanosecond (2 seconds or more")
5959
.format("%Y-%m-%d %H:%M:%S")
6060
.to_string();
61+
62+
#[allow(clippy::useless_conversion)]
6163
let compression = match FromPrimitive::from_i32(unsafe {
6264
readstat_sys::readstat_get_compression(metadata)
65+
.try_into()
66+
.unwrap()
6367
}) {
6468
Some(t) => t,
6569
None => ReadStatCompress::None,
6670
};
67-
let endianness =
68-
match FromPrimitive::from_i32(unsafe { readstat_sys::readstat_get_endianness(metadata) }) {
69-
Some(t) => t,
70-
None => ReadStatEndian::None,
71-
};
71+
72+
#[allow(clippy::useless_conversion)]
73+
let endianness = match FromPrimitive::from_i32(unsafe {
74+
readstat_sys::readstat_get_endianness(metadata)
75+
.try_into()
76+
.unwrap()
77+
}) {
78+
Some(t) => t,
79+
None => ReadStatEndian::None,
80+
};
7281

7382
debug!("row_count is {}", rc);
7483
debug!("var_count is {}", vc);
@@ -130,15 +139,21 @@ pub extern "C" fn handle_variable(
130139
let m = unsafe { &mut *(ctx as *mut ReadStatMetadata) };
131140

132141
// get variable metadata
142+
#[allow(clippy::useless_conversion)]
133143
let var_type = match FromPrimitive::from_i32(unsafe {
134144
readstat_sys::readstat_variable_get_type(variable)
145+
.try_into()
146+
.unwrap()
135147
}) {
136148
Some(t) => t,
137149
None => ReadStatVarType::Unknown,
138150
};
139151

152+
#[allow(clippy::useless_conversion)]
140153
let var_type_class = match FromPrimitive::from_i32(unsafe {
141154
readstat_sys::readstat_variable_get_type_class(variable)
155+
.try_into()
156+
.unwrap()
142157
}) {
143158
Some(t) => t,
144159
None => ReadStatVarTypeClass::Numeric,

crates/readstat/src/rs_data.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,8 @@ impl ReadStatData {
340340
.set_row_offset(Some(self.chunk_row_start.try_into().unwrap()))?
341341
.parse_sas7bdat(ppath, ctx);
342342

343-
match FromPrimitive::from_i32(error) {
343+
#[allow(clippy::useless_conversion)]
344+
match FromPrimitive::from_i32(error.try_into().unwrap()) {
344345
Some(ReadStatError::READSTAT_OK) => Ok(()),
345346
Some(e) => Err(From::from(format!(
346347
"Error when attempting to parse sas7bdat: {:#?}",

crates/readstat/src/rs_metadata.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ impl ReadStatMetadata {
141141
}
142142
*/
143143

144-
match FromPrimitive::from_i32(error) {
144+
#[allow(clippy::useless_conversion)]
145+
match FromPrimitive::from_i32(error.try_into().unwrap()) {
145146
Some(ReadStatError::READSTAT_OK) => {
146147
// if successful, initialize schema
147148
self.schema = self.initialize_schema();

crates/readstat/src/rs_parser.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ impl ReadStatParser {
3131
&set_metadata_handler_error
3232
);
3333

34-
match FromPrimitive::from_i32(set_metadata_handler_error) {
34+
#[allow(clippy::useless_conversion)]
35+
match FromPrimitive::from_i32(set_metadata_handler_error.try_into().unwrap()) {
3536
Some(ReadStatError::READSTAT_OK) => Ok(self),
3637
Some(e) => Err(From::from(format!(
3738
"Unable to set metdata handler: {:#?}",
@@ -57,7 +58,8 @@ impl ReadStatParser {
5758
&set_row_limit_error
5859
);
5960

60-
match FromPrimitive::from_i32(set_row_limit_error) {
61+
#[allow(clippy::useless_conversion)]
62+
match FromPrimitive::from_i32(set_row_limit_error.try_into().unwrap()) {
6163
Some(ReadStatError::READSTAT_OK) => Ok(self),
6264
Some(e) => Err(From::from(format!("Unable to set row limit: {:#?}", e))),
6365
None => Err(From::from(
@@ -83,7 +85,8 @@ impl ReadStatParser {
8385
&set_row_offset_error
8486
);
8587

86-
match FromPrimitive::from_i32(set_row_offset_error) {
88+
#[allow(clippy::useless_conversion)]
89+
match FromPrimitive::from_i32(set_row_offset_error.try_into().unwrap()) {
8790
Some(ReadStatError::READSTAT_OK) => Ok(self),
8891
Some(e) => Err(From::from(format!("Unable to set row limit: {:#?}", e))),
8992
None => Err(From::from(
@@ -107,7 +110,8 @@ impl ReadStatParser {
107110
&set_variable_handler_error
108111
);
109112

110-
match FromPrimitive::from_i32(set_variable_handler_error) {
113+
#[allow(clippy::useless_conversion)]
114+
match FromPrimitive::from_i32(set_variable_handler_error.try_into().unwrap()) {
111115
Some(ReadStatError::READSTAT_OK) => Ok(self),
112116
Some(e) => Err(From::from(format!(
113117
"Unable to set variable handler: {:#?}",
@@ -131,7 +135,8 @@ impl ReadStatParser {
131135
&set_value_handler_error
132136
);
133137

134-
match FromPrimitive::from_i32(set_value_handler_error) {
138+
#[allow(clippy::useless_conversion)]
139+
match FromPrimitive::from_i32(set_value_handler_error.try_into().unwrap()) {
135140
Some(ReadStatError::READSTAT_OK) => Ok(self),
136141
Some(e) => Err(From::from(format!("Unable to set value handler: {:#?}", e))),
137142
None => Err(From::from(

0 commit comments

Comments
 (0)