diff options
| author | Caleb Maclennan <caleb@alerque.com> | 2021-03-28 10:59:58 +0300 |
|---|---|---|
| committer | Caleb Maclennan <caleb@alerque.com> | 2021-03-28 20:15:08 +0300 |
| commit | 7687476f9b3b478e17e72a63b2a45d12d92e348d (patch) | |
| tree | 84a1ef8450f48f199e97131a75a9240910193318 /src | |
| parent | 225005994d46e634918568b9013cfae82c491a8a (diff) | |
Rename get_str() → get_string() to match returned type
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.rs | 4 | ||||
| -rw-r--r-- | src/de.rs | 8 | ||||
| -rw-r--r-- | src/value.rs | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/config.rs b/src/config.rs index 94658da..0377438 100644 --- a/src/config.rs +++ b/src/config.rs @@ -211,8 +211,8 @@ impl Config { } } - pub fn get_str(&self, key: &str) -> Result<String> { - self.get(key).and_then(Value::into_str) + pub fn get_string(&self, key: &str) -> Result<String> { + self.get(key).and_then(Value::into_string) } pub fn get_int(&self, key: &str) -> Result<i64> { @@ -89,12 +89,12 @@ impl<'de> de::Deserializer<'de> for Value { #[inline] fn deserialize_str<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> { - visitor.visit_string(self.into_str()?) + visitor.visit_string(self.into_string()?) } #[inline] fn deserialize_string<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> { - visitor.visit_string(self.into_str()?) + visitor.visit_string(self.into_string()?) } #[inline] @@ -421,12 +421,12 @@ impl<'de> de::Deserializer<'de> for Config { #[inline] fn deserialize_str<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> { - visitor.visit_string(self.cache.into_str()?) + visitor.visit_string(self.cache.into_string()?) } #[inline] fn deserialize_string<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> { - visitor.visit_string(self.cache.into_str()?) + visitor.visit_string(self.cache.into_string()?) } #[inline] diff --git a/src/value.rs b/src/value.rs index 177acf7..602b40a 100644 --- a/src/value.rs +++ b/src/value.rs @@ -286,9 +286,9 @@ impl Value { } } - /// Returns `self` into a str, if possible. + /// Returns `self` into a string, if possible. // FIXME: Should this not be `try_into_*` ? - pub fn into_str(self) -> Result<String> { + pub fn into_string(self) -> Result<String> { match self.kind { ValueKind::String(value) => Ok(value), |