extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-29 11:54:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use serde to deserialize Tagged<Value>

Browse Source
This commit is contained in:
est31 2019-09-02 23:23:34 +02:00
parent 9ba2e75ac1
commit cc8872b4ee
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/object/types.rs
View File

@ -24,14 +24,6 @@ impl<T: ExtractType> ExtractType for Tagged<T> {
} }
} }
impl ExtractType for Value {
fn extract(value: &Tagged<Value>) -> Result<Value, ShellError> {
trace!("<Tagged> Extracting {:?} for Value", value);
Ok(value.item().clone())
}
}
impl ExtractType for bool { impl ExtractType for bool {
fn extract(value: &Tagged<Value>) -> Result<bool, ShellError> { fn extract(value: &Tagged<Value>) -> Result<bool, ShellError> {
trace!("Extracting {:?} for bool", value); trace!("Extracting {:?} for bool", value);

12
src/parser/deserializer.rs
View File

@ -323,6 +323,13 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut ConfigDeserializer<'de> {
let value = self.pop(); let value = self.pop();
let type_name = std::any::type_name::<V::Value>();
let tagged_val_name = std::any::type_name::<Tagged<Value>>();
if name == tagged_val_name {
return visit::<Tagged<Value>, _>(value.val, name, fields, visitor);
}
if name == "Block" { if name == "Block" {
let block = match value.val { let block = match value.val {
Tagged { Tagged {
@ -331,11 +338,10 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut ConfigDeserializer<'de> {
} => block, } => block,
other => return Err(ShellError::type_error("Block", other.tagged_type_name())), other => return Err(ShellError::type_error("Block", other.tagged_type_name())),
}; };
return visit(block, name, fields, visitor); return visit::<value::Block, _>(block, name, fields, visitor);
} }
let name = std::any::type_name::<V::Value>(); trace!("Extracting {:?} for {:?}", value.val, type_name);
trace!("Extracting {:?} for {:?}", value.val, name);
V::Value::extract(&value.val) V::Value::extract(&value.val)
} }
fn deserialize_enum<V>( fn deserialize_enum<V>(