aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHimbeerserverDE <himbeerserverde@gmail.com>2022-10-22 15:30:55 +0200
committerHimbeerserverDE <himbeerserverde@gmail.com>2022-10-22 15:30:55 +0200
commit67f8b89946cf7e003ac5a7ad31f00b4a1de4b45c (patch)
tree697e06c2c90d639428ef12acd05f37eba54865c2
parent0e1befd43c2109220570338a1fe30539a13170e4 (diff)
cargo fmt
-rw-r--r--src/call/nameserver.rs2
-rw-r--r--src/error/mod.rs8
-rw-r--r--src/response/nameserver.rs41
3 files changed, 18 insertions, 33 deletions
diff --git a/src/call/nameserver.rs b/src/call/nameserver.rs
index 2e1a7e3..b136f0c 100644
--- a/src/call/nameserver.rs
+++ b/src/call/nameserver.rs
@@ -1,5 +1,5 @@
-use crate::{Error, Result};
use super::Call;
+use crate::{Error, Result};
use std::collections::BTreeMap;
use std::fmt;
diff --git a/src/error/mod.rs b/src/error/mod.rs
index 29d32f9..218997f 100644
--- a/src/error/mod.rs
+++ b/src/error/mod.rs
@@ -23,20 +23,20 @@ impl fmt::Display for Error {
Error::XmlRpc(err) => write!(fmt, "xmlrpc error: {}", err),
Error::Inexistent(what) => {
write!(fmt, "parameter {} does not exist", what)
- },
+ }
Error::Type(what, exp, got) => {
write!(
fmt,
"parameter {what} is of wrong type {got:?} (expected: {exp})"
)
- },
+ }
Error::BadResponse(resp) => write!(fmt, "bad response: {:?}", resp),
Error::BadStatus(expected, got) => {
write!(fmt, "bad status {} (expected: {:?}", got, expected)
- },
+ }
Error::BadVariant(ename, var) => {
write!(fmt, "{} is not a valid enum variant for {}", var, ename)
- },
+ }
}
}
}
diff --git a/src/response/nameserver.rs b/src/response/nameserver.rs
index e5211e1..f485e38 100644
--- a/src/response/nameserver.rs
+++ b/src/response/nameserver.rs
@@ -1,52 +1,37 @@
-use crate::{Error, Result};
use crate::call::nameserver::RecordType;
+use crate::{Error, Result};
use std::collections::BTreeMap;
use std::fmt;
use iso8601::DateTime;
-fn get_str(
- map: &BTreeMap<String, xmlrpc::Value>,
- key: &'static str,
-) -> Result<String> {
- let value = map.get(key)
+fn get_str(map: &BTreeMap<String, xmlrpc::Value>, key: &'static str) -> Result<String> {
+ let value = map
+ .get(key)
.ok_or(Error::Inexistent(key))?
.as_str()
- .ok_or_else(|| Error::Type(key, "String", map.get(key)
- .unwrap()
- .clone()
- ))?;
+ .ok_or_else(|| Error::Type(key, "String", map.get(key).unwrap().clone()))?;
Ok(value.to_owned())
}
-fn get_i32(
- map: &BTreeMap<String, xmlrpc::Value>,
- key: &'static str,
-) -> Result<i32> {
- let value = map.get(key)
+fn get_i32(map: &BTreeMap<String, xmlrpc::Value>, key: &'static str) -> Result<i32> {
+ let value = map
+ .get(key)
.ok_or(Error::Inexistent(key))?
.as_i32()
- .ok_or_else(|| Error::Type(key, "Int", map.get(key)
- .unwrap()
- .clone()
- ))?;
+ .ok_or_else(|| Error::Type(key, "Int", map.get(key).unwrap().clone()))?;
Ok(value)
}
-fn get_bool(
- map: &BTreeMap<String, xmlrpc::Value>,
- key: &'static str,
-) -> Result<bool> {
- let value = map.get(key)
+fn get_bool(map: &BTreeMap<String, xmlrpc::Value>, key: &'static str) -> Result<bool> {
+ let value = map
+ .get(key)
.ok_or(Error::Inexistent(key))?
.as_bool()
- .ok_or_else(|| Error::Type(key, "Bool", map.get(key)
- .unwrap()
- .clone()
- ))?;
+ .ok_or_else(|| Error::Type(key, "Bool", map.get(key).unwrap().clone()))?;
Ok(value)
}