Fix clippy and doctest warnings/errors

This commit is contained in:
Raj Vengalil 2022-08-06 13:55:09 +05:30
parent 839ce6f119
commit d92870910b
3 changed files with 10 additions and 8 deletions

View file

@ -833,7 +833,7 @@ implement_simple_commands! {
pub fn get_network_version() -> String { pub fn get_network_version() -> String {
( (
{ Command::NetworkVersion }, { Command::NetworkVersion },
{ |row: String| Ok(row) }, { Ok },
) )
} }
@ -841,7 +841,7 @@ implement_simple_commands! {
pub fn get_server_version() -> String { pub fn get_server_version() -> String {
( (
{ Command::Version }, { Command::Version },
{ |row: String| Ok(row) }, { Ok },
) )
} }
} }

View file

@ -213,6 +213,9 @@ macro_rules! impl_sentences {
/// 2. the decoded sentence /// 2. the decoded sentence
/// ///
/// ``` /// ```
/// # #[macro_use] extern crate rups;
/// # fn main() {
/// # #[cfg(test)]
/// test_encode_decode!( /// test_encode_decode!(
/// ["GET", "VAR", "nutdev", "test.var"] <=> /// ["GET", "VAR", "nutdev", "test.var"] <=>
/// Sentences::QueryVar { /// Sentences::QueryVar {
@ -220,6 +223,7 @@ macro_rules! impl_sentences {
/// var_name: "test.var".into(), /// var_name: "test.var".into(),
/// } /// }
/// ); /// );
/// # }
/// ``` /// ```
#[allow(unused_macros)] #[allow(unused_macros)]
macro_rules! test_encode_decode { macro_rules! test_encode_decode {

View file

@ -5,7 +5,7 @@ use std::time::Duration;
/// Well-known variable keys for NUT UPS devices. /// Well-known variable keys for NUT UPS devices.
/// ///
/// List retrieved from: https://networkupstools.org/docs/user-manual.chunked/apcs01.html /// List retrieved from: <https://networkupstools.org/docs/user-manual.chunked/apcs01.html>
pub mod key { pub mod key {
/// Device model. /// Device model.
pub const DEVICE_MODEL: &str = "device.model"; pub const DEVICE_MODEL: &str = "device.model";
@ -31,7 +31,7 @@ pub mod key {
/// Well-known variables for NUT UPS devices. /// Well-known variables for NUT UPS devices.
/// ///
/// List retrieved from: https://networkupstools.org/docs/user-manual.chunked/apcs01.html /// List retrieved from: <https://networkupstools.org/docs/user-manual.chunked/apcs01.html>
#[derive(Debug, Clone, Eq, PartialEq)] #[derive(Debug, Clone, Eq, PartialEq)]
pub enum Variable { pub enum Variable {
/// Device model. /// Device model.
@ -196,10 +196,8 @@ impl TryFrom<&str> for VariableType {
other => { other => {
if other.starts_with("STRING:") { if other.starts_with("STRING:") {
let size = other let size = other
.splitn(2, ':') .split_once(':')
.nth(1) .and_then(|(_, s)| s.parse().ok())
.map(|s| s.parse().ok())
.flatten()
.ok_or_else(|| crate::ClientError::generic("Invalid STRING definition"))?; .ok_or_else(|| crate::ClientError::generic("Invalid STRING definition"))?;
Ok(Self::String(size)) Ok(Self::String(size))
} else { } else {