From 7687476f9b3b478e17e72a63b2a45d12d92e348d Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sun, 28 Mar 2021 10:59:58 +0300 Subject: =?UTF-8?q?Rename=20get=5Fstr()=20=E2=86=92=20get=5Fstring()=20to?= =?UTF-8?q?=20match=20returned=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config.rs | 4 ++-- src/de.rs | 8 ++++---- src/value.rs | 4 ++-- tests/file_hjson.rs | 2 +- tests/file_json.rs | 6 +++--- tests/file_toml.rs | 2 +- tests/file_yaml.rs | 2 +- tests/get.rs | 4 ++-- 8 files changed, 16 insertions(+), 16 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 { - self.get(key).and_then(Value::into_str) + pub fn get_string(&self, key: &str) -> Result { + self.get(key).and_then(Value::into_string) } pub fn get_int(&self, key: &str) -> Result { diff --git a/src/de.rs b/src/de.rs index c4fdeb2..0e88642 100644 --- a/src/de.rs +++ b/src/de.rs @@ -89,12 +89,12 @@ impl<'de> de::Deserializer<'de> for Value { #[inline] fn deserialize_str>(self, visitor: V) -> Result { - visitor.visit_string(self.into_str()?) + visitor.visit_string(self.into_string()?) } #[inline] fn deserialize_string>(self, visitor: V) -> Result { - 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>(self, visitor: V) -> Result { - visitor.visit_string(self.cache.into_str()?) + visitor.visit_string(self.cache.into_string()?) } #[inline] fn deserialize_string>(self, visitor: V) -> Result { - 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 { + pub fn into_string(self) -> Result { match self.kind { ValueKind::String(value) => Ok(value), diff --git a/tests/file_hjson.rs b/tests/file_hjson.rs index 87318eb..b76ccb5 100644 --- a/tests/file_hjson.rs +++ b/tests/file_hjson.rs @@ -60,7 +60,7 @@ fn test_file() { assert_eq!(s.elements.len(), 10); assert_eq!(s.elements[3], "4".to_string()); assert_eq!( - s.place.creator["name"].clone().into_str().unwrap(), + s.place.creator["name"].clone().into_string().unwrap(), "John Smith".to_string() ); } diff --git a/tests/file_json.rs b/tests/file_json.rs index 2c614e1..b8dcbf0 100644 --- a/tests/file_json.rs +++ b/tests/file_json.rs @@ -60,7 +60,7 @@ fn test_file() { assert_eq!(s.elements.len(), 10); assert_eq!(s.elements[3], "4".to_string()); assert_eq!( - s.place.creator["name"].clone().into_str().unwrap(), + s.place.creator["name"].clone().into_string().unwrap(), "John Smith".to_string() ); } @@ -98,7 +98,7 @@ fn test_json_vec() { let v = c.get_array("WASTE").unwrap(); let mut vi = v.into_iter(); - assert_eq!(vi.next().unwrap().into_str().unwrap(), "example_dir1"); - assert_eq!(vi.next().unwrap().into_str().unwrap(), "example_dir2"); + assert_eq!(vi.next().unwrap().into_string().unwrap(), "example_dir1"); + assert_eq!(vi.next().unwrap().into_string().unwrap(), "example_dir2"); assert!(vi.next().is_none()); } diff --git a/tests/file_toml.rs b/tests/file_toml.rs index 834499f..de52548 100644 --- a/tests/file_toml.rs +++ b/tests/file_toml.rs @@ -71,7 +71,7 @@ fn test_file() { assert_eq!(s.elements.len(), 10); assert_eq!(s.elements[3], "4".to_string()); assert_eq!( - s.place.creator["name"].clone().into_str().unwrap(), + s.place.creator["name"].clone().into_string().unwrap(), "John Smith".to_string() ); } diff --git a/tests/file_yaml.rs b/tests/file_yaml.rs index 59174e6..892875e 100644 --- a/tests/file_yaml.rs +++ b/tests/file_yaml.rs @@ -60,7 +60,7 @@ fn test_file() { assert_eq!(s.elements.len(), 10); assert_eq!(s.elements[3], "4".to_string()); assert_eq!( - s.place.creator["name"].clone().into_str().unwrap(), + s.place.creator["name"].clone().into_string().unwrap(), "John Smith".to_string() ); } diff --git a/tests/get.rs b/tests/get.rs index 10ec066..8d6db51 100644 --- a/tests/get.rs +++ b/tests/get.rs @@ -111,7 +111,7 @@ fn test_map() { assert_eq!(m.len(), 8); assert_eq!( - m["name"].clone().into_str().unwrap(), + m["name"].clone().into_string().unwrap(), "Torre di Pisa".to_string() ); assert_eq!(m["reviews"].clone().into_int().unwrap(), 3866); @@ -138,7 +138,7 @@ fn test_map_struct() { assert_eq!(s.place.len(), 8); assert_eq!( - s.place["name"].clone().into_str().unwrap(), + s.place["name"].clone().into_string().unwrap(), "Torre di Pisa".to_string() ); assert_eq!(s.place["reviews"].clone().into_int().unwrap(), 3866); -- cgit v1.2.3