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

Shrink the size of Expr (#12610)

Browse Source 
# Description
Continuing from #12568, this PR further reduces the size of `Expr` from
64 to 40 bytes. It also reduces `Expression` from 128 to 96 bytes and
`Type` from 32 to 24 bytes.

This was accomplished by:
- for `Expr` with multiple fields (e.g., `Expr::Thing(A, B, C)`),
merging the fields into new AST struct types and then boxing this struct
(e.g. `Expr::Thing(Box<ABC>)`).
- replacing `Vec<T>` with `Box<[T]>` in multiple places. `Expr`s and
`Expression`s should rarely be mutated, if at all, so this optimization
makes sense.

By reducing the size of these types, I didn't notice a large performance
improvement (at least compared to #12568). But this PR does reduce the
memory usage of nushell. My config is somewhat light so I only noticed a
difference of 1.4MiB (38.9MiB vs 37.5MiB).

---------

Co-authored-by: Stefan Holderbach <sholderbach@users.noreply.github.com>
This commit is contained in:
Ian Manske
2024-04-24 15:46:35 +00:00
committed by GitHub
parent c52884b3c8
commit 9996e4a1f8
195 changed files with 688 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/nu-command/src/formats/to/csv.rs
View File

@ -13,8 +13,8 @@ impl Command for ToCsv {
fn signature(&self) -> Signature {
Signature::build("to csv")
.input_output_types(vec![
(Type::Record(vec![]), Type::String),
(Type::Table(vec![]), Type::String),
(Type::record(), Type::String),
(Type::table(), Type::String),
])
.named(
"separator",

2
crates/nu-command/src/formats/to/toml.rs
View File

@ -12,7 +12,7 @@ impl Command for ToToml {
fn signature(&self) -> Signature {
Signature::build("to toml")
.input_output_types(vec![(Type::Record(vec![]), Type::String)])
.input_output_types(vec![(Type::record(), Type::String)])
.category(Category::Formats)
}

4
crates/nu-command/src/formats/to/tsv.rs
View File

@ -13,8 +13,8 @@ impl Command for ToTsv {
fn signature(&self) -> Signature {
Signature::build("to tsv")
.input_output_types(vec![
(Type::Record(vec![]), Type::String),
(Type::Table(vec![]), Type::String),
(Type::record(), Type::String),
(Type::table(), Type::String),
])
.switch(
"noheaders",

18
crates/nu-command/src/formats/to/xml.rs
View File

@ -18,7 +18,7 @@ impl Command for ToXml {
fn signature(&self) -> Signature {
Signature::build("to xml")
.input_output_types(vec![(Type::Record(vec![]), Type::String)])
.input_output_types(vec![(Type::record(), Type::String)])
.named(
"indent",
SyntaxShape::Int,
@ -300,7 +300,7 @@ impl Job {
if top_level {
return Err(ShellError::CantConvert {
to_type: "XML".into(),
from_type: Type::Record(vec![]).to_string(),
from_type: Type::record().to_string(),
span: entry_span,
help: Some("PIs can not be a root element of document".into()),
});
@ -312,7 +312,7 @@ impl Job {
_ => {
return Err(ShellError::CantConvert {
to_type: "XML".into(),
from_type: Type::Record(vec![]).to_string(),
from_type: Type::record().to_string(),
span: content.span(),
help: Some("PI content expected to be a string".into()),
});
@ -369,7 +369,7 @@ impl Job {
.write_event(Event::Comment(comment_content))
.map_err(|_| ShellError::CantConvert {
to_type: "XML".to_string(),
from_type: Type::Record(vec![]).to_string(),
from_type: Type::record().to_string(),
span: entry_span,
help: Some("Failure writing comment to xml".into()),
})
@ -393,7 +393,7 @@ impl Job {
if !matches!(attrs, Value::Nothing { .. }) {
return Err(ShellError::CantConvert {
to_type: "XML".into(),
from_type: Type::Record(vec![]).to_string(),
from_type: Type::record().to_string(),
span: entry_span,
help: Some("PIs do not have attributes".into()),
});
@ -408,7 +408,7 @@ impl Job {
.write_event(Event::PI(pi_content))
.map_err(|_| ShellError::CantConvert {
to_type: "XML".to_string(),
from_type: Type::Record(vec![]).to_string(),
from_type: Type::record().to_string(),
span: entry_span,
help: Some("Failure writing PI to xml".into()),
})
@ -425,7 +425,7 @@ impl Job {
if tag.starts_with('!') || tag.starts_with('?') {
return Err(ShellError::CantConvert {
to_type: "XML".to_string(),
from_type: Type::Record(vec![]).to_string(),
from_type: Type::record().to_string(),
span: tag_span,
help: Some(format!(
"Incorrect tag name {}, tag name can not start with ! or ?",
@ -448,7 +448,7 @@ impl Job {
.write_event(open_tag_event)
.map_err(|_| ShellError::CantConvert {
to_type: "XML".to_string(),
from_type: Type::Record(vec![]).to_string(),
from_type: Type::record().to_string(),
span: entry_span,
help: Some("Failure writing tag to xml".into()),
})?;
@ -463,7 +463,7 @@ impl Job {
.write_event(close_tag_event)
.map_err(|_| ShellError::CantConvert {
to_type: "XML".to_string(),
from_type: Type::Record(vec![]).to_string(),
from_type: Type::record().to_string(),
span: entry_span,
help: Some("Failure writing tag to xml".into()),
})?;