summaryrefslogtreecommitdiffstats
path: root/src/value.rs
diff options
context:
space:
mode:
authorFederico Pasqua <federico.pasqua.96@gmail.com>2020-03-14 15:46:36 +0100
committerFederico Pasqua <federico.pasqua.96@gmail.com>2020-03-14 16:01:54 +0100
commit57fb2610ad274dff1d2f2e4d43dfce05ca9c4835 (patch)
tree45e4c5c57df0eea23e8977de0984965d9a8a56b4 /src/value.rs
parent2c0b201055be60ec45e258adcc6c4b6e01bcd627 (diff)
General upgrade for clippy fix and remove of deprecated methods for errors
Diffstat (limited to 'src/value.rs')
-rw-r--r--src/value.rs24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/value.rs b/src/value.rs
index 2db195d..177acf7 100644
--- a/src/value.rs
+++ b/src/value.rs
@@ -39,7 +39,7 @@ where
impl From<String> for ValueKind {
fn from(value: String) -> Self {
- ValueKind::String(value.into())
+ ValueKind::String(value)
}
}
@@ -179,17 +179,17 @@ impl Value {
// Unexpected type
ValueKind::Nil => Err(ConfigError::invalid_type(
- self.origin.clone(),
+ self.origin,
Unexpected::Unit,
"a boolean",
)),
ValueKind::Table(_) => Err(ConfigError::invalid_type(
- self.origin.clone(),
+ self.origin,
Unexpected::Map,
"a boolean",
)),
ValueKind::Array(_) => Err(ConfigError::invalid_type(
- self.origin.clone(),
+ self.origin,
Unexpected::Seq,
"a boolean",
)),
@@ -224,17 +224,17 @@ impl Value {
// Unexpected type
ValueKind::Nil => Err(ConfigError::invalid_type(
- self.origin.clone(),
+ self.origin,
Unexpected::Unit,
"an integer",
)),
ValueKind::Table(_) => Err(ConfigError::invalid_type(
- self.origin.clone(),
+ self.origin,
Unexpected::Map,
"an integer",
)),
ValueKind::Array(_) => Err(ConfigError::invalid_type(
- self.origin.clone(),
+ self.origin,
Unexpected::Seq,
"an integer",
)),
@@ -269,17 +269,17 @@ impl Value {
// Unexpected type
ValueKind::Nil => Err(ConfigError::invalid_type(
- self.origin.clone(),
+ self.origin,
Unexpected::Unit,
"a floating point",
)),
ValueKind::Table(_) => Err(ConfigError::invalid_type(
- self.origin.clone(),
+ self.origin,
Unexpected::Map,
"a floating point",
)),
ValueKind::Array(_) => Err(ConfigError::invalid_type(
- self.origin.clone(),
+ self.origin,
Unexpected::Seq,
"a floating point",
)),
@@ -500,7 +500,7 @@ impl<'de> Deserialize<'de> for Value {
{
let mut vec = Array::new();
- while let Some(elem) = try!(visitor.next_element()) {
+ while let Some(elem) = visitor.next_element()? {
vec.push(elem);
}
@@ -513,7 +513,7 @@ impl<'de> Deserialize<'de> for Value {
{
let mut values = Table::new();
- while let Some((key, value)) = try!(visitor.next_entry()) {
+ while let Some((key, value)) = visitor.next_entry()? {
values.insert(key, value);
}