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

Add general refactorings (#3996)

Browse Source
This commit is contained in:
Marcin Puc
2021-09-10 00:44:22 +02:00
committed by GitHub
parent ae9f4135c0
commit 51c74eebd0
165 changed files with 540 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
crates/nu-data/src/base/shape.rs
View File

@@ -110,7 +110,7 @@ impl InlineShape {
pub fn from_dictionary(dictionary: &Dictionary) -> InlineShape {
let mut map = IndexMap::new();
for (key, value) in dictionary.entries.iter() {
for (key, value) in &dictionary.entries {
let column = Column::String(key.clone());
map.insert(column, InlineShape::from_value(value));
}
@@ -119,11 +119,7 @@ impl InlineShape {
}
pub fn from_table<'a>(table: impl IntoIterator<Item = &'a Value>) -> InlineShape {
let mut vec = vec![];
for item in table.into_iter() {
vec.push(InlineShape::from_value(item))
}
let vec = table.into_iter().map(InlineShape::from_value).collect();
InlineShape::Table(vec)
}
@@ -150,7 +146,7 @@ impl InlineShape {
match value.into() {
UntaggedValue::Primitive(p) => InlineShape::from_primitive(p),
UntaggedValue::Row(row) => InlineShape::from_dictionary(row),
UntaggedValue::Table(table) => InlineShape::from_table(table.iter()),
UntaggedValue::Table(table) => InlineShape::from_table(table),
UntaggedValue::Error(_) => InlineShape::Error,
UntaggedValue::Block(_) => InlineShape::Block,
#[cfg(feature = "dataframe")]
@@ -261,10 +257,9 @@ impl InlineShape {
}
}
} else {
let doc = (DbgDocBldr::primitive(format!("{}", bytesize))
+ DbgDocBldr::space()
+ DbgDocBldr::kind("B"))
.group();
let doc =
(DbgDocBldr::primitive(bytesize) + DbgDocBldr::space() + DbgDocBldr::kind("B"))
.group();
(doc.clone(), InlineShape::render_doc(&doc))
}
}
@@ -284,8 +279,8 @@ impl PrettyDebug for FormatInlineShape {
match &self.shape {
InlineShape::Nothing => DbgDocBldr::blank(),
InlineShape::Int(int) => DbgDocBldr::primitive(format!("{}", int)),
InlineShape::BigInt(int) => DbgDocBldr::primitive(format!("{}", int)),
InlineShape::Int(int) => DbgDocBldr::primitive(int),
InlineShape::BigInt(int) => DbgDocBldr::primitive(int),
InlineShape::Decimal(decimal) => DbgDocBldr::description(format_primitive(
&Primitive::Decimal(decimal.clone()),
None,