From c1637e94b81b2f8ee69a44fc0031daecbd7d5287 Mon Sep 17 00:00:00 2001 From: Milan Zamazal Date: Mon, 7 Aug 2023 20:52:53 +0200 Subject: [PATCH] scmi: Use new_device for ScmiDevice constructors Instead of `new', which should be reserved for direct constructors. Signed-off-by: Milan Zamazal --- crates/scmi/src/devices/common.rs | 2 +- crates/scmi/src/devices/fake.rs | 3 +-- crates/scmi/src/scmi.rs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/crates/scmi/src/devices/common.rs b/crates/scmi/src/devices/common.rs index d5568c8..c4db9ca 100644 --- a/crates/scmi/src/devices/common.rs +++ b/crates/scmi/src/devices/common.rs @@ -128,7 +128,7 @@ pub fn available_devices() -> NameDeviceMapping { devices.insert( "fake", DeviceSpecification::new( - fake::FakeSensor::new, + fake::FakeSensor::new_device, "fake accelerometer", "A simple 3-axes sensor providing fake pre-defined values.", &["name: an optional name of the sensor, max. 15 characters"], diff --git a/crates/scmi/src/devices/fake.rs b/crates/scmi/src/devices/fake.rs index 5cde468..bc760b8 100644 --- a/crates/scmi/src/devices/fake.rs +++ b/crates/scmi/src/devices/fake.rs @@ -51,8 +51,7 @@ impl SensorT for FakeSensor { } impl FakeSensor { - #[allow(clippy::new_ret_no_self)] - pub fn new(properties: &DeviceProperties) -> MaybeDevice { + pub fn new_device(properties: &DeviceProperties) -> MaybeDevice { properties.check(&[], &["name"])?; let sensor = Sensor::new(properties, "fake"); let fake_sensor = Self { sensor, value: 0 }; diff --git a/crates/scmi/src/scmi.rs b/crates/scmi/src/scmi.rs index 87d6789..2c525d3 100644 --- a/crates/scmi/src/scmi.rs +++ b/crates/scmi/src/scmi.rs @@ -870,7 +870,7 @@ mod tests { let mut handler = ScmiHandler::new(); for i in 0..2 { let properties = DeviceProperties::new(vec![("name".to_owned(), format!("fake{i}"))]); - let fake_sensor = FakeSensor::new(&properties).unwrap(); + let fake_sensor = FakeSensor::new_device(&properties).unwrap(); handler.register_device(fake_sensor); } handler