Merge pull request #72 from kerhong/master
Implement Value::lookup for empty path to return self
This commit is contained in:
commit
24b022b485
20
src/lib.rs
20
src/lib.rs
|
@ -155,6 +155,8 @@ impl Value {
|
||||||
///
|
///
|
||||||
/// Note: arrays have zero-based indexes.
|
/// Note: arrays have zero-based indexes.
|
||||||
///
|
///
|
||||||
|
/// Note: empty path returns self.
|
||||||
|
///
|
||||||
/// ```
|
/// ```
|
||||||
/// # #![allow(unstable)]
|
/// # #![allow(unstable)]
|
||||||
/// let toml = r#"
|
/// let toml = r#"
|
||||||
|
@ -180,6 +182,10 @@ impl Value {
|
||||||
/// ```
|
/// ```
|
||||||
pub fn lookup<'a>(&'a self, path: &'a str) -> Option<&'a Value> {
|
pub fn lookup<'a>(&'a self, path: &'a str) -> Option<&'a Value> {
|
||||||
let mut cur_value = self;
|
let mut cur_value = self;
|
||||||
|
if path.len() == 0 {
|
||||||
|
return Some(cur_value)
|
||||||
|
}
|
||||||
|
|
||||||
for key in path.split('.') {
|
for key in path.split('.') {
|
||||||
match cur_value {
|
match cur_value {
|
||||||
&Value::Table(ref hm) => {
|
&Value::Table(ref hm) => {
|
||||||
|
@ -260,4 +266,18 @@ mod tests {
|
||||||
let foo = value.lookup("values.str.foo");
|
let foo = value.lookup("values.str.foo");
|
||||||
assert!(foo.is_none());
|
assert!(foo.is_none());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn lookup_self() {
|
||||||
|
let value: Value = r#"foo = "bar""#.parse().unwrap();
|
||||||
|
|
||||||
|
let foo = value.lookup("foo").unwrap();
|
||||||
|
assert_eq!(foo.as_str().unwrap(), "bar");
|
||||||
|
|
||||||
|
let foo = value.lookup("").unwrap();
|
||||||
|
assert!(foo.as_table().is_some());
|
||||||
|
|
||||||
|
let baz = foo.lookup("foo").unwrap();
|
||||||
|
assert_eq!(baz.as_str().unwrap(), "bar");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue