diff --git a/lib/src/request.rs b/lib/src/request.rs index 0359652..f86272b 100644 --- a/lib/src/request.rs +++ b/lib/src/request.rs @@ -211,7 +211,7 @@ impl Request { .offsets .iter() .position(|v| v == &offset) - .ok_or_else(|| Error::InvalidArgument("offset is not a requested line.".to_string()))?; + .ok_or_else(|| Error::InvalidArgument("offset is not a requested line.".into()))?; self.do_value(idx) } #[cfg(all(feature = "uapi_v1", feature = "uapi_v2"))] @@ -285,7 +285,7 @@ impl Request { if !values.contains_keys(&self.offsets) { return Err(Error::AbiLimitation( AbiVersion::V1, - "requires all requested lines".to_string(), + "requires all requested lines".into(), )); } v1::set_line_values(&self.f, &values.to_v1(&self.offsets)) @@ -296,7 +296,7 @@ impl Request { let lv = &values.to_v2(&self.offsets); if lv.mask == 0 { return Err(Error::InvalidArgument( - "no requested lines in set values.".to_string(), + "no requested lines in set values.".into(), )); } v2::set_line_values(&self.f, lv).map_err(|e| Error::Uapi(UapiCall::SetLineValues, e)) @@ -322,7 +322,7 @@ impl Request { .offsets .iter() .position(|v| v == &offset) - .ok_or_else(|| Error::InvalidArgument("offset is not a requested line.".to_string()))?; + .ok_or_else(|| Error::InvalidArgument("offset is not a requested line.".into()))?; self.do_set_value(idx, value) } #[cfg(all(feature = "uapi_v1", feature = "uapi_v2"))] @@ -345,7 +345,7 @@ impl Request { if self.offsets.len() > 1 { return Err(Error::AbiLimitation( AbiVersion::V1, - "requires all requested lines".to_string(), + "requires all requested lines".into(), )); } let mut vals = v1::LineValues::default(); @@ -426,13 +426,13 @@ impl Request { { return Err(Error::AbiLimitation( AbiVersion::V1, - "cannot reconfigure lines with edge detection".to_string(), + "cannot reconfigure lines with edge detection".into(), )); } if cfg.unique()?.edge_detection.is_some() { return Err(Error::AbiLimitation( AbiVersion::V1, - "cannot reconfigure edge detection".to_string(), + "cannot reconfigure edge detection".into(), )); } v1::set_line_config(&self.f, cfg.to_v1()?) @@ -454,13 +454,13 @@ impl Request { { return Err(Error::AbiLimitation( AbiVersion::V1, - "cannot reconfigure lines with edge detection".to_string(), + "cannot reconfigure lines with edge detection".into(), )); } if cfg.unique()?.edge_detection.is_some() { return Err(Error::AbiLimitation( AbiVersion::V1, - "cannot reconfigure edge detection".to_string(), + "cannot reconfigure edge detection".into(), )); } v1::set_line_config(&self.f, cfg.to_v1()?) diff --git a/lib/src/request/builder.rs b/lib/src/request/builder.rs index 8b0bfe0..1026683 100644 --- a/lib/src/request/builder.rs +++ b/lib/src/request/builder.rs @@ -105,7 +105,7 @@ impl Builder { return Err(e.clone()); } if self.cfg.chip.as_os_str().is_empty() { - return Err(Error::InvalidArgument("No chip specified.".to_string())); + return Err(Error::InvalidArgument("No chip specified.".into())); } let chip = Chip::from_path(&self.cfg.chip)?; self.cfg.offsets.sort_unstable(); @@ -274,7 +274,7 @@ impl Builder { self.cfg.on_chip(path); } else if self.cfg.chip != path.into() { self.err = Some(Error::InvalidArgument( - "Multiple chips requested.".to_string(), + "Multiple chips requested.".into(), )) } self @@ -482,7 +482,7 @@ impl Builder { // Conversions into uAPI types. fn to_uapi(&self) -> Result { if self.cfg.num_lines() == 0 { - return Err(Error::InvalidArgument("No lines specified.".to_string())); + return Err(Error::InvalidArgument("No lines specified.".into())); } if self.cfg.offsets.len() > NUM_LINES_MAX { return Err(Error::InvalidArgument(format!( @@ -514,20 +514,20 @@ impl Builder { if self.kernel_event_buffer_size != 0 { return Err(Error::AbiLimitation( AbiVersion::V1, - "does not support setting event buffer size".to_string(), + "does not support setting event buffer size".into(), )); } let lcfg = self.cfg.unique()?; if lcfg.debounce_period.is_some() { return Err(Error::AbiLimitation( AbiVersion::V1, - "does not support debounce".to_string(), + "does not support debounce".into(), )); } if lcfg.event_clock.is_some() { return Err(Error::AbiLimitation( AbiVersion::V1, - "does not support selecting the event clock source".to_string(), + "does not support selecting the event clock source".into(), )); } let consumer = if self.consumer.is_empty() { @@ -539,7 +539,7 @@ impl Builder { if self.cfg.offsets.len() != 1 { return Err(Error::AbiLimitation( AbiVersion::V1, - "only supports edge detection on single line requests".to_string(), + "only supports edge detection on single line requests".into(), )); } Ok(UapiRequest::Event(v1::EventRequest { diff --git a/lib/src/request/config.rs b/lib/src/request/config.rs index 4bef40f..0917132 100644 --- a/lib/src/request/config.rs +++ b/lib/src/request/config.rs @@ -255,7 +255,7 @@ impl Config { Ok(self) } else { Err(Error::InvalidArgument( - "Multiple chips requested.".to_string(), + "Multiple chips requested.".into(), )) } } @@ -403,7 +403,7 @@ impl Config { if !lcfg.equivalent(self.lcfg.get(offset).unwrap()) { return Err(Error::AbiLimitation( AbiVersion::V1, - "requires all lines to share the same configuration".to_string(), + "requires all lines to share the same configuration".into(), )); } } diff --git a/lib/tests/request.rs b/lib/tests/request.rs index b0aa029..591394f 100644 --- a/lib/tests/request.rs +++ b/lib/tests/request.rs @@ -70,7 +70,7 @@ mod builder { .request(); assert_eq!( res.unwrap_err(), - gpiocdev::Error::AbiLimitation(V1, "does not support debounce".to_string(),) + gpiocdev::Error::AbiLimitation(V1, "does not support debounce".into(),) ); } @@ -93,7 +93,7 @@ mod builder { res.unwrap_err(), gpiocdev::Error::AbiLimitation( V1, - "does not support selecting the event clock source".to_string(), + "does not support selecting the event clock source".into(), ) ); } @@ -117,7 +117,7 @@ mod builder { res.unwrap_err(), gpiocdev::Error::AbiLimitation( V1, - "does not support setting event buffer size".to_string(), + "does not support setting event buffer size".into(), ) ); } @@ -680,7 +680,7 @@ mod builder { .as_input() .request() .unwrap_err(), - gpiocdev::Error::InvalidArgument("Multiple chips requested.".to_string()) + gpiocdev::Error::InvalidArgument("Multiple chips requested.".into()) ); } @@ -828,7 +828,7 @@ mod builder { .request(); assert_eq!( res.unwrap_err(), - gpiocdev::Error::InvalidArgument("Multiple chips requested.".to_string()) + gpiocdev::Error::InvalidArgument("Multiple chips requested.".into()) ); } @@ -1285,7 +1285,7 @@ mod request { let res = req.value(3); assert_eq!( res.unwrap_err(), - gpiocdev::Error::InvalidArgument("offset is not a requested line.".to_string()) + gpiocdev::Error::InvalidArgument("offset is not a requested line.".into()) ); } @@ -1415,7 +1415,7 @@ mod request { req.set_value(*offset, Value::Active).unwrap_err(), gpiocdev::Error::AbiLimitation( AbiVersion::V1, - "requires all requested lines".to_string(), + "requires all requested lines".into(), ) ); } @@ -1425,7 +1425,7 @@ mod request { let res = req.set_value(3, Value::Active); assert_eq!( res.unwrap_err(), - gpiocdev::Error::InvalidArgument("offset is not a requested line.".to_string()) + gpiocdev::Error::InvalidArgument("offset is not a requested line.".into()) ); } @@ -1501,7 +1501,7 @@ mod request { req.set_values(&vals).unwrap_err(), gpiocdev::Error::AbiLimitation( AbiVersion::V1, - "requires all requested lines".to_string(), + "requires all requested lines".into(), ) ); @@ -1512,7 +1512,7 @@ mod request { req.set_values(&vals).unwrap_err(), gpiocdev::Error::AbiLimitation( AbiVersion::V1, - "requires all requested lines".to_string(), + "requires all requested lines".into(), ) ); @@ -1522,7 +1522,7 @@ mod request { req.set_values(&vals), Err(gpiocdev::Error::AbiLimitation( AbiVersion::V1, - "requires all requested lines".to_string() + "requires all requested lines".into() )) ); }