arampoire/nut-rs
1
0
Fork 0
mirror of https://github.com/arampoire/nut-rs.git synced 2025-12-01 00:30:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename ClientError to Error

Browse source
This commit is contained in:
Aram 🍐 2021-08-04 15:14:23 -04:00
parent 7d26301571
commit ea96f433e6
8 changed files with 86 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rups/src/util.rs
View file

@ -1,3 +1,4 @@
use crate::Error;
use std::convert::{TryFrom, TryInto};
use std::fmt;
@ -30,7 +31,7 @@ impl<'a> Default for UpsdName<'a> {
}
impl<'a> TryFrom<&'a str> for UpsdName<'a> {
type Error = crate::ClientError;
type Error = crate::Error;
fn try_from(value: &'a str) -> crate::Result<UpsdName<'a>> {
let mut upsname: Option<&str> = None;
@ -44,7 +45,7 @@ impl<'a> TryFrom<&'a str> for UpsdName<'a> {
.next()
.unwrap()
.parse::<u16>()
.map_err(|_| crate::ClientError::generic("Invalid port number"))?;
.map_err(|_| Error::generic("Invalid port number"))?;
if prefix.contains('@') {
let mut split = prefix.splitn(2, '@');
upsname = Some(split.next().unwrap());
@ -69,12 +70,12 @@ impl<'a> TryFrom<&'a str> for UpsdName<'a> {
}
impl<'a> TryInto<crate::Host> for UpsdName<'a> {
type Error = crate::ClientError;
type Error = crate::Error;
fn try_into(self) -> crate::Result<crate::Host> {
(self.hostname.to_owned(), self.port)
.try_into()
.map_err(|_| crate::ClientError::generic("Invalid hostname/port"))
.map_err(|_| Error::generic("Invalid hostname/port"))
}
}