diff options
| author | Erik Schilling <erik.schilling@linaro.org> | 2023-10-04 15:00:00 +0200 |
|---|---|---|
| committer | Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | 2023-10-04 20:40:36 +0200 |
| commit | a29f3e6957914dc564c723a8fc405cd99e407fd2 (patch) | |
| tree | 6260ad055e0e18ccf92c192893c4d7003c204fda | |
| parent | 808d15ebffdcee5e418a210815e57e6128e0f803 (diff) | |
| download | libgpiod-a29f3e6957914dc564c723a8fc405cd99e407fd2.tar.gz | |
bindings: rust: rename {event,settings}_clone to try_clone
What is getting cloned is already clear from the type. This also aligns
a bit better with similar methods from the `std` crate [1].
[1] https://doc.rust-lang.org/std/index.html?search=try_clone
Link: https://lore.kernel.org/r/CVUKC1HXG1P8.13XIUCCXN95F0@ablu-work
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Erik Schilling <erik.schilling@linaro.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
| -rw-r--r-- | bindings/rust/libgpiod/examples/buffered_event_lifetimes.rs | 2 | ||||
| -rw-r--r-- | bindings/rust/libgpiod/src/edge_event.rs | 3 | ||||
| -rw-r--r-- | bindings/rust/libgpiod/src/line_settings.rs | 4 | ||||
| -rw-r--r-- | bindings/rust/libgpiod/tests/line_request.rs | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/bindings/rust/libgpiod/examples/buffered_event_lifetimes.rs b/bindings/rust/libgpiod/examples/buffered_event_lifetimes.rs index ad90d7b9..8dbb4963 100644 --- a/bindings/rust/libgpiod/examples/buffered_event_lifetimes.rs +++ b/bindings/rust/libgpiod/examples/buffered_event_lifetimes.rs @@ -34,7 +34,7 @@ fn main() -> libgpiod::Result<()> { let event = events.next().unwrap()?; // This will out live `event` and the next read_edge_events(). - let cloned_event = libgpiod::request::Event::event_clone(event)?; + let cloned_event = libgpiod::request::Event::try_clone(event)?; let events = request.read_edge_events(&mut buffer)?; for event in events { diff --git a/bindings/rust/libgpiod/src/edge_event.rs b/bindings/rust/libgpiod/src/edge_event.rs index 639f033a..7f8f3773 100644 --- a/bindings/rust/libgpiod/src/edge_event.rs +++ b/bindings/rust/libgpiod/src/edge_event.rs @@ -29,7 +29,8 @@ pub struct Event(*mut gpiod::gpiod_edge_event); unsafe impl Send for Event {} impl Event { - pub fn event_clone(event: &Event) -> Result<Event> { + /// Makes a copy of the event object. + pub fn try_clone(event: &Event) -> Result<Event> { // SAFETY: `gpiod_edge_event` is guaranteed to be valid here. let event = unsafe { gpiod::gpiod_edge_event_copy(event.0) }; if event.is_null() { diff --git a/bindings/rust/libgpiod/src/line_settings.rs b/bindings/rust/libgpiod/src/line_settings.rs index c81d1188..4ba20d45 100644 --- a/bindings/rust/libgpiod/src/line_settings.rs +++ b/bindings/rust/libgpiod/src/line_settings.rs @@ -56,8 +56,8 @@ impl Settings { unsafe { gpiod::gpiod_line_settings_reset(self.settings) } } - /// Makes copy of the settings object. - pub fn settings_clone(&self) -> Result<Self> { + /// Makes a copy of the settings object. + pub fn try_clone(&self) -> Result<Self> { // SAFETY: `gpiod_line_settings` is guaranteed to be valid here. let settings = unsafe { gpiod::gpiod_line_settings_copy(self.settings) }; if settings.is_null() { diff --git a/bindings/rust/libgpiod/tests/line_request.rs b/bindings/rust/libgpiod/tests/line_request.rs index da22bea2..e0ae2004 100644 --- a/bindings/rust/libgpiod/tests/line_request.rs +++ b/bindings/rust/libgpiod/tests/line_request.rs @@ -272,7 +272,7 @@ mod line_request { for offset in offsets { lsettings.set_debounce_period(Duration::from_millis((100 + offset).into())); lconfig - .add_line_settings(&[offset as Offset], lsettings.settings_clone().unwrap()) + .add_line_settings(&[offset as Offset], lsettings.try_clone().unwrap()) .unwrap(); } |