extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-17 20:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move to using clippy (#1142)

Browse Source 
* Clippy fixes

* Finish converting to use clippy

* fix warnings in new master

* fix windows

* fix windows

Co-authored-by: Artem Vorotnikov <artem@vorotnikov.me>
This commit is contained in:
Jonathan Turner
2019-12-31 20:36:08 +13:00
committed by GitHub
parent 8093612cac
commit 72838cc083
93 changed files with 754 additions and 852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
crates/nu-value-ext/src/lib.rs
View File

@ -9,7 +9,7 @@ use num_traits::cast::ToPrimitive;
pub trait ValueExt {
fn into_parts(self) -> (UntaggedValue, Tag);
fn get_data(&self, desc: &String) -> MaybeOwned<'_, Value>;
fn get_data(&self, desc: &str) -> MaybeOwned<'_, Value>;
fn get_data_by_key(&self, name: Spanned<&str>) -> Option<Value>;
fn get_data_by_member(&self, name: &PathMember) -> Result<Value, ShellError>;
fn get_data_by_column_path(
@ -43,7 +43,7 @@ impl ValueExt for Value {
(self.value, self.tag)
}
fn get_data(&self, desc: &String) -> MaybeOwned<'_, Value> {
fn get_data(&self, desc: &str) -> MaybeOwned<'_, Value> {
get_data(self, desc)
}
@ -163,14 +163,9 @@ pub fn get_data_by_member(value: &Value, name: &PathMember) -> Result<Value, She
)
})?;
match get_data_by_index(value, index.spanned(value.tag.span)) {
Some(v) => Ok(v.clone()),
None => Err(ShellError::range_error(
0..(l.len()),
&int.spanned(name.span),
"indexing",
)),
}
get_data_by_index(value, index.spanned(value.tag.span)).ok_or_else(|| {
ShellError::range_error(0..(l.len()), &int.spanned(name.span), "indexing")
})
}
}
}
@ -193,7 +188,7 @@ pub fn get_data_by_column_path(
match value {
Ok(v) => current = v.clone(),
Err(e) => return Err(callback((&current.clone(), &p.clone(), e))),
Err(e) => return Err(callback((&current, &p.clone(), e))),
}
}
@ -210,10 +205,9 @@ pub fn insert_data_at_path(value: &Value, path: &str, new_value: Value) -> Optio
if split_path.len() == 1 {
// Special case for inserting at the top level
current.entries.insert(
path.to_string(),
new_value.value.clone().into_value(&value.tag),
);
current
.entries
.insert(path.to_string(), new_value.value.into_value(&value.tag));
return Some(new_obj);
}
@ -275,7 +269,7 @@ pub fn insert_data_at_member(
)
})?;
insert_data_at_index(array, int.tagged(member.span), new_value.clone())?;
insert_data_at_index(array, int.tagged(member.span), new_value)?;
Ok(())
}
},
@ -428,7 +422,7 @@ fn insert_data_at_index(
}
}
pub fn get_data<'value>(value: &'value Value, desc: &String) -> MaybeOwned<'value, Value> {
pub fn get_data<'value>(value: &'value Value, desc: &str) -> MaybeOwned<'value, Value> {
match &value.value {
UntaggedValue::Primitive(_) => MaybeOwned::Borrowed(value),
UntaggedValue::Row(o) => o.get_data(desc),