@@ -46,7 +46,7 @@ impl Value {
errno::errno(),
))
}
- _ => return Err(Error::InvalidEnumValue("Value", val as i32)),
+ _ => return Err(Error::InvalidEnumValue("Value", val)),
})
}
}
@@ -164,7 +164,7 @@ impl SimBank {
errno::errno(),
))
} else {
- Value::new(ret as i32)
+ Value::new(ret)
}
}
@@ -279,7 +279,7 @@ impl Info {
/// Get the number of GPIO lines exposed by the chip.
pub fn num_lines(&self) -> usize {
// SAFETY: `gpiod_chip` is guaranteed to be valid here.
- unsafe { gpiod::gpiod_chip_info_get_num_lines(self.info) as usize }
+ unsafe { gpiod::gpiod_chip_info_get_num_lines(self.info) }
}
}
@@ -41,7 +41,7 @@ impl Event {
/// Get the event type.
pub fn event_type(&self) -> Result<EdgeKind> {
// SAFETY: `gpiod_edge_event` is guaranteed to be valid here.
- EdgeKind::new(unsafe { gpiod::gpiod_edge_event_get_event_type(self.0) } as u32)
+ EdgeKind::new(unsafe { gpiod::gpiod_edge_event_get_event_type(self.0) })
}
/// Get the timestamp of the event.
@@ -82,7 +82,7 @@ impl Buffer {
}
// SAFETY: `gpiod_edge_event_buffer` is guaranteed to be valid here.
- let capacity = unsafe { gpiod::gpiod_edge_event_buffer_get_capacity(buffer) as usize };
+ let capacity = unsafe { gpiod::gpiod_edge_event_buffer_get_capacity(buffer) };
Ok(Self {
buffer,
@@ -34,7 +34,7 @@ impl Event {
/// Get the event type of the status change event.
pub fn event_type(&self) -> Result<InfoChangeKind> {
// SAFETY: `gpiod_info_event` is guaranteed to be valid here.
- InfoChangeKind::new(unsafe { gpiod::gpiod_info_event_get_event_type(self.event) } as u32)
+ InfoChangeKind::new(unsafe { gpiod::gpiod_info_event_get_event_type(self.event) })
}
/// Get the timestamp of the event, read from the monotonic clock.
@@ -193,7 +193,7 @@ pub mod line {
errno::errno(),
))
}
- _ => return Err(Error::InvalidEnumValue("Value", val as i32)),
+ _ => return Err(Error::InvalidEnumValue("Value", val)),
})
}
@@ -108,7 +108,7 @@ impl Config {
let mut map = SettingsMap::new();
// SAFETY: gpiod_line_config is guaranteed to be valid here
let num_lines = unsafe { gpiod::gpiod_line_config_get_num_configured_offsets(self.config) };
- let mut offsets = vec![0; num_lines as usize];
+ let mut offsets = vec![0; num_lines];
// SAFETY: gpiod_line_config is guaranteed to be valid here.
let num_stored = unsafe {
@@ -119,7 +119,7 @@ impl Config {
)
};
- for offset in &offsets[0..num_stored as usize] {
+ for offset in &offsets[0..num_stored] {
// SAFETY: `gpiod_line_config` is guaranteed to be valid here.
let settings =
unsafe { gpiod::gpiod_line_config_get_line_settings(self.config, *offset) };
@@ -28,12 +28,12 @@ impl Request {
/// Get the number of lines in the request.
pub fn num_lines(&self) -> usize {
// SAFETY: `gpiod_line_request` is guaranteed to be valid here.
- unsafe { gpiod::gpiod_line_request_get_num_requested_lines(self.request) as usize }
+ unsafe { gpiod::gpiod_line_request_get_num_requested_lines(self.request) }
}
/// Get the offsets of lines in the request.
pub fn offsets(&self) -> Vec<Offset> {
- let mut offsets = vec![0; self.num_lines() as usize];
+ let mut offsets = vec![0; self.num_lines()];
// SAFETY: `gpiod_line_request` is guaranteed to be valid here.
let num_offsets = unsafe {
@@ -43,7 +43,7 @@ impl Request {
self.num_lines(),
)
};
- offsets.shrink_to(num_offsets as usize);
+ offsets.shrink_to(num_offsets);
offsets
}
@@ -145,7 +145,7 @@ impl Request {
/// Set values of all lines associated with the request.
pub fn set_values(&mut self, values: &[Value]) -> Result<&mut Self> {
- if values.len() != self.num_lines() as usize {
+ if values.len() != self.num_lines() {
return Err(Error::InvalidArguments);
}
@@ -244,7 +244,7 @@ impl Settings {
/// Get the event clock setting.
pub fn event_clock(&self) -> Result<EventClock> {
// SAFETY: `gpiod_line_settings` is guaranteed to be valid here.
- EventClock::new(unsafe { gpiod::gpiod_line_settings_get_event_clock(self.settings) } as u32)
+ EventClock::new(unsafe { gpiod::gpiod_line_settings_get_event_clock(self.settings) })
}
/// Set the output value setting.
@@ -83,7 +83,7 @@ impl Config {
/// Get the edge event buffer size setting for the request config.
pub fn event_buffer_size(&self) -> usize {
// SAFETY: `gpiod_request_config` is guaranteed to be valid here.
- unsafe { gpiod::gpiod_request_config_get_event_buffer_size(self.config) as usize }
+ unsafe { gpiod::gpiod_request_config_get_event_buffer_size(self.config) }
}
}
@@ -59,7 +59,7 @@ mod chip {
assert_eq!(info.label().unwrap(), LABEL);
assert_eq!(info.name().unwrap(), sim.chip_name());
assert_eq!(chip.path().unwrap(), sim.dev_path().to_str().unwrap());
- assert_eq!(info.num_lines(), NGPIO as usize);
+ assert_eq!(info.num_lines(), NGPIO);
}
#[test]
Fixes clippy warnings on these lines. Applied the suggested fix using: cargo clippy --fix clippy version: clippy 0.1.70 (90c5418 2023-05-31). Reported-by: Kent Gibson <warthog618@gmail.com> Link: https://lore.kernel.org/r/20230612154055.56556-1-warthog618@gmail.com Signed-off-by: Erik Schilling <erik.schilling@linaro.org> --- bindings/rust/gpiosim-sys/src/lib.rs | 2 +- bindings/rust/gpiosim-sys/src/sim.rs | 2 +- bindings/rust/libgpiod/src/chip.rs | 2 +- bindings/rust/libgpiod/src/edge_event.rs | 2 +- bindings/rust/libgpiod/src/event_buffer.rs | 2 +- bindings/rust/libgpiod/src/info_event.rs | 2 +- bindings/rust/libgpiod/src/lib.rs | 2 +- bindings/rust/libgpiod/src/line_config.rs | 4 ++-- bindings/rust/libgpiod/src/line_request.rs | 8 ++++---- bindings/rust/libgpiod/src/line_settings.rs | 2 +- bindings/rust/libgpiod/src/request_config.rs | 2 +- bindings/rust/libgpiod/tests/chip.rs | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-)