mirror of
https://github.com/nushell/nushell.git
synced 2024-11-28 19:33:47 +01:00
Invert &Option
s to Option<&T>
(#10315)
Elide the reference for `Copy` type (`usize`) Use the canonical deref where possible. * `&Box` -> `&` * `&String` -> `&str` * `&PathBuf` -> `&Path` Skips the ctrl-C handler for now.
This commit is contained in:
parent
3e14dc3eb8
commit
a14e9e0a2e
@ -125,7 +125,7 @@ pub fn parse_sql_expr(expr: &SqlExpr) -> Result<Expr> {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn apply_window_spec(expr: Expr, window_type: &Option<WindowType>) -> Result<Expr> {
|
fn apply_window_spec(expr: Expr, window_type: Option<&WindowType>) -> Result<Expr> {
|
||||||
Ok(match &window_type {
|
Ok(match &window_type {
|
||||||
Some(wtype) => match wtype {
|
Some(wtype) => match wtype {
|
||||||
WindowType::WindowSpec(window_spec) => {
|
WindowType::WindowSpec(window_spec) => {
|
||||||
@ -168,13 +168,13 @@ fn parse_sql_function(sql_function: &SQLFunction) -> Result<Expr> {
|
|||||||
sql_function.distinct,
|
sql_function.distinct,
|
||||||
) {
|
) {
|
||||||
("sum", [FunctionArgExpr::Expr(expr)], false) => {
|
("sum", [FunctionArgExpr::Expr(expr)], false) => {
|
||||||
apply_window_spec(parse_sql_expr(expr)?, &sql_function.over)?.sum()
|
apply_window_spec(parse_sql_expr(expr)?, sql_function.over.as_ref())?.sum()
|
||||||
}
|
}
|
||||||
("count", [FunctionArgExpr::Expr(expr)], false) => {
|
("count", [FunctionArgExpr::Expr(expr)], false) => {
|
||||||
apply_window_spec(parse_sql_expr(expr)?, &sql_function.over)?.count()
|
apply_window_spec(parse_sql_expr(expr)?, sql_function.over.as_ref())?.count()
|
||||||
}
|
}
|
||||||
("count", [FunctionArgExpr::Expr(expr)], true) => {
|
("count", [FunctionArgExpr::Expr(expr)], true) => {
|
||||||
apply_window_spec(parse_sql_expr(expr)?, &sql_function.over)?.n_unique()
|
apply_window_spec(parse_sql_expr(expr)?, sql_function.over.as_ref())?.n_unique()
|
||||||
}
|
}
|
||||||
// Special case for wildcard args to count function.
|
// Special case for wildcard args to count function.
|
||||||
("count", [FunctionArgExpr::Wildcard], false) => lit(1i32).count(),
|
("count", [FunctionArgExpr::Wildcard], false) => lit(1i32).count(),
|
||||||
|
@ -44,7 +44,7 @@ enum InputNumType {
|
|||||||
SignedEight,
|
SignedEight,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_number_bytes(number_bytes: &Option<Spanned<String>>) -> NumberBytes {
|
fn get_number_bytes(number_bytes: Option<&Spanned<String>>) -> NumberBytes {
|
||||||
match number_bytes.as_ref() {
|
match number_bytes.as_ref() {
|
||||||
None => NumberBytes::Eight,
|
None => NumberBytes::Eight,
|
||||||
Some(size) => match size.item.as_str() {
|
Some(size) => match size.item.as_str() {
|
||||||
|
@ -57,7 +57,7 @@ impl Command for BitsNot {
|
|||||||
let signed = call.has_flag("signed");
|
let signed = call.has_flag("signed");
|
||||||
let number_bytes: Option<Spanned<String>> =
|
let number_bytes: Option<Spanned<String>> =
|
||||||
call.get_flag(engine_state, stack, "number-bytes")?;
|
call.get_flag(engine_state, stack, "number-bytes")?;
|
||||||
let bytes_len = get_number_bytes(&number_bytes);
|
let bytes_len = get_number_bytes(number_bytes.as_ref());
|
||||||
if let NumberBytes::Invalid = bytes_len {
|
if let NumberBytes::Invalid = bytes_len {
|
||||||
if let Some(val) = number_bytes {
|
if let Some(val) = number_bytes {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
|
@ -60,7 +60,7 @@ impl Command for BitsRol {
|
|||||||
let signed = call.has_flag("signed");
|
let signed = call.has_flag("signed");
|
||||||
let number_bytes: Option<Spanned<String>> =
|
let number_bytes: Option<Spanned<String>> =
|
||||||
call.get_flag(engine_state, stack, "number-bytes")?;
|
call.get_flag(engine_state, stack, "number-bytes")?;
|
||||||
let bytes_len = get_number_bytes(&number_bytes);
|
let bytes_len = get_number_bytes(number_bytes.as_ref());
|
||||||
if let NumberBytes::Invalid = bytes_len {
|
if let NumberBytes::Invalid = bytes_len {
|
||||||
if let Some(val) = number_bytes {
|
if let Some(val) = number_bytes {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
|
@ -60,7 +60,7 @@ impl Command for BitsRor {
|
|||||||
let signed = call.has_flag("signed");
|
let signed = call.has_flag("signed");
|
||||||
let number_bytes: Option<Spanned<String>> =
|
let number_bytes: Option<Spanned<String>> =
|
||||||
call.get_flag(engine_state, stack, "number-bytes")?;
|
call.get_flag(engine_state, stack, "number-bytes")?;
|
||||||
let bytes_len = get_number_bytes(&number_bytes);
|
let bytes_len = get_number_bytes(number_bytes.as_ref());
|
||||||
if let NumberBytes::Invalid = bytes_len {
|
if let NumberBytes::Invalid = bytes_len {
|
||||||
if let Some(val) = number_bytes {
|
if let Some(val) = number_bytes {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
|
@ -60,7 +60,7 @@ impl Command for BitsShl {
|
|||||||
let signed = call.has_flag("signed");
|
let signed = call.has_flag("signed");
|
||||||
let number_bytes: Option<Spanned<String>> =
|
let number_bytes: Option<Spanned<String>> =
|
||||||
call.get_flag(engine_state, stack, "number-bytes")?;
|
call.get_flag(engine_state, stack, "number-bytes")?;
|
||||||
let bytes_len = get_number_bytes(&number_bytes);
|
let bytes_len = get_number_bytes(number_bytes.as_ref());
|
||||||
if let NumberBytes::Invalid = bytes_len {
|
if let NumberBytes::Invalid = bytes_len {
|
||||||
if let Some(val) = number_bytes {
|
if let Some(val) = number_bytes {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
|
@ -60,7 +60,7 @@ impl Command for BitsShr {
|
|||||||
let signed = call.has_flag("signed");
|
let signed = call.has_flag("signed");
|
||||||
let number_bytes: Option<Spanned<String>> =
|
let number_bytes: Option<Spanned<String>> =
|
||||||
call.get_flag(engine_state, stack, "number-bytes")?;
|
call.get_flag(engine_state, stack, "number-bytes")?;
|
||||||
let bytes_len = get_number_bytes(&number_bytes);
|
let bytes_len = get_number_bytes(number_bytes.as_ref());
|
||||||
if let NumberBytes::Invalid = bytes_len {
|
if let NumberBytes::Invalid = bytes_len {
|
||||||
if let Some(val) = number_bytes {
|
if let Some(val) = number_bytes {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
|
@ -48,7 +48,7 @@ enum HorizontalDirection {
|
|||||||
|
|
||||||
fn horizontal_rotate_value(
|
fn horizontal_rotate_value(
|
||||||
value: Value,
|
value: Value,
|
||||||
by: &Option<usize>,
|
by: Option<usize>,
|
||||||
cells_only: bool,
|
cells_only: bool,
|
||||||
direction: &HorizontalDirection,
|
direction: &HorizontalDirection,
|
||||||
) -> Result<Value, ShellError> {
|
) -> Result<Value, ShellError> {
|
||||||
|
@ -106,7 +106,7 @@ impl Command for RollLeft {
|
|||||||
let cells_only = call.has_flag("cells-only");
|
let cells_only = call.has_flag("cells-only");
|
||||||
let value = input.into_value(call.head);
|
let value = input.into_value(call.head);
|
||||||
let rotated_value =
|
let rotated_value =
|
||||||
horizontal_rotate_value(value, &by, cells_only, &HorizontalDirection::Left)?;
|
horizontal_rotate_value(value, by, cells_only, &HorizontalDirection::Left)?;
|
||||||
|
|
||||||
Ok(rotated_value.into_pipeline_data().set_metadata(metadata))
|
Ok(rotated_value.into_pipeline_data().set_metadata(metadata))
|
||||||
}
|
}
|
||||||
|
@ -106,7 +106,7 @@ impl Command for RollRight {
|
|||||||
let cells_only = call.has_flag("cells-only");
|
let cells_only = call.has_flag("cells-only");
|
||||||
let value = input.into_value(call.head);
|
let value = input.into_value(call.head);
|
||||||
let rotated_value =
|
let rotated_value =
|
||||||
horizontal_rotate_value(value, &by, cells_only, &HorizontalDirection::Right)?;
|
horizontal_rotate_value(value, by, cells_only, &HorizontalDirection::Right)?;
|
||||||
|
|
||||||
Ok(rotated_value.into_pipeline_data().set_metadata(metadata))
|
Ok(rotated_value.into_pipeline_data().set_metadata(metadata))
|
||||||
}
|
}
|
||||||
|
@ -164,7 +164,7 @@ impl Command for ToHtml {
|
|||||||
|
|
||||||
fn get_theme_from_asset_file(
|
fn get_theme_from_asset_file(
|
||||||
is_dark: bool,
|
is_dark: bool,
|
||||||
theme: &Option<Spanned<String>>,
|
theme: Option<&Spanned<String>>,
|
||||||
) -> Result<HashMap<&'static str, String>, ShellError> {
|
) -> Result<HashMap<&'static str, String>, ShellError> {
|
||||||
let theme_name = match theme {
|
let theme_name = match theme {
|
||||||
Some(s) => &s.item,
|
Some(s) => &s.item,
|
||||||
@ -301,7 +301,7 @@ fn to_html(
|
|||||||
None => head,
|
None => head,
|
||||||
};
|
};
|
||||||
|
|
||||||
let color_hm = get_theme_from_asset_file(dark, &theme);
|
let color_hm = get_theme_from_asset_file(dark, theme.as_ref());
|
||||||
let color_hm = match color_hm {
|
let color_hm = match color_hm {
|
||||||
Ok(c) => c,
|
Ok(c) => c,
|
||||||
_ => {
|
_ => {
|
||||||
|
@ -98,12 +98,12 @@ fn operate(
|
|||||||
|
|
||||||
if column_paths.is_empty() {
|
if column_paths.is_empty() {
|
||||||
input.map(
|
input.map(
|
||||||
move |v| process_value(&v, &text),
|
move |v| process_value(&v, text.as_deref()),
|
||||||
engine_state.ctrlc.clone(),
|
engine_state.ctrlc.clone(),
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
input.map(
|
input.map(
|
||||||
move |v| process_each_path(v, &column_paths, &text, command_span),
|
move |v| process_each_path(v, &column_paths, text.as_deref(), command_span),
|
||||||
engine_state.ctrlc.clone(),
|
engine_state.ctrlc.clone(),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@ -112,7 +112,7 @@ fn operate(
|
|||||||
fn process_each_path(
|
fn process_each_path(
|
||||||
mut value: Value,
|
mut value: Value,
|
||||||
column_paths: &[CellPath],
|
column_paths: &[CellPath],
|
||||||
text: &Option<String>,
|
text: Option<&str>,
|
||||||
command_span: Span,
|
command_span: Span,
|
||||||
) -> Value {
|
) -> Value {
|
||||||
for path in column_paths {
|
for path in column_paths {
|
||||||
@ -124,11 +124,11 @@ fn process_each_path(
|
|||||||
value
|
value
|
||||||
}
|
}
|
||||||
|
|
||||||
fn process_value(value: &Value, text: &Option<String>) -> Value {
|
fn process_value(value: &Value, text: Option<&str>) -> Value {
|
||||||
let span = value.span();
|
let span = value.span();
|
||||||
match value {
|
match value {
|
||||||
Value::String { val, .. } => {
|
Value::String { val, .. } => {
|
||||||
let text = text.as_deref().unwrap_or(val.as_str());
|
let text = text.unwrap_or(val.as_str());
|
||||||
let result = add_osc_link(text, val.as_str());
|
let result = add_osc_link(text, val.as_str());
|
||||||
Value::string(result, span)
|
Value::string(result, span)
|
||||||
}
|
}
|
||||||
|
@ -54,23 +54,33 @@ impl Command for Metadata {
|
|||||||
} => {
|
} => {
|
||||||
let origin = stack.get_var_with_origin(*var_id, *span)?;
|
let origin = stack.get_var_with_origin(*var_id, *span)?;
|
||||||
|
|
||||||
Ok(build_metadata_record(&origin, &input.metadata(), head)
|
Ok(
|
||||||
.into_pipeline_data())
|
build_metadata_record(&origin, input.metadata().as_deref(), head)
|
||||||
|
.into_pipeline_data(),
|
||||||
|
)
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
let val: Value = call.req(engine_state, stack, 0)?;
|
let val: Value = call.req(engine_state, stack, 0)?;
|
||||||
Ok(build_metadata_record(&val, &input.metadata(), head)
|
Ok(
|
||||||
.into_pipeline_data())
|
build_metadata_record(&val, input.metadata().as_deref(), head)
|
||||||
|
.into_pipeline_data(),
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
let val: Value = call.req(engine_state, stack, 0)?;
|
let val: Value = call.req(engine_state, stack, 0)?;
|
||||||
Ok(build_metadata_record(&val, &input.metadata(), head).into_pipeline_data())
|
Ok(
|
||||||
|
build_metadata_record(&val, input.metadata().as_deref(), head)
|
||||||
|
.into_pipeline_data(),
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Some(_) => {
|
Some(_) => {
|
||||||
let val: Value = call.req(engine_state, stack, 0)?;
|
let val: Value = call.req(engine_state, stack, 0)?;
|
||||||
Ok(build_metadata_record(&val, &input.metadata(), head).into_pipeline_data())
|
Ok(
|
||||||
|
build_metadata_record(&val, input.metadata().as_deref(), head)
|
||||||
|
.into_pipeline_data(),
|
||||||
|
)
|
||||||
}
|
}
|
||||||
None => {
|
None => {
|
||||||
let mut record = Record::new();
|
let mut record = Record::new();
|
||||||
@ -109,11 +119,7 @@ impl Command for Metadata {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn build_metadata_record(
|
fn build_metadata_record(arg: &Value, metadata: Option<&PipelineMetadata>, head: Span) -> Value {
|
||||||
arg: &Value,
|
|
||||||
metadata: &Option<Box<PipelineMetadata>>,
|
|
||||||
head: Span,
|
|
||||||
) -> Value {
|
|
||||||
let mut record = Record::new();
|
let mut record = Record::new();
|
||||||
|
|
||||||
let span = arg.span();
|
let span = arg.span();
|
||||||
@ -128,7 +134,7 @@ fn build_metadata_record(
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
if let Some(x) = metadata.as_deref() {
|
if let Some(x) = metadata {
|
||||||
match x {
|
match x {
|
||||||
PipelineMetadata {
|
PipelineMetadata {
|
||||||
data_source: DataSource::Ls,
|
data_source: DataSource::Ls,
|
||||||
|
@ -87,7 +87,7 @@ impl Command for Save {
|
|||||||
match input {
|
match input {
|
||||||
PipelineData::ExternalStream { stdout: None, .. } => {
|
PipelineData::ExternalStream { stdout: None, .. } => {
|
||||||
// Open files to possibly truncate them
|
// Open files to possibly truncate them
|
||||||
let _ = get_files(&path, &stderr_path, append, force)?;
|
let _ = get_files(&path, stderr_path.as_ref(), append, force)?;
|
||||||
Ok(PipelineData::empty())
|
Ok(PipelineData::empty())
|
||||||
}
|
}
|
||||||
PipelineData::ExternalStream {
|
PipelineData::ExternalStream {
|
||||||
@ -95,7 +95,7 @@ impl Command for Save {
|
|||||||
stderr,
|
stderr,
|
||||||
..
|
..
|
||||||
} => {
|
} => {
|
||||||
let (file, stderr_file) = get_files(&path, &stderr_path, append, force)?;
|
let (file, stderr_file) = get_files(&path, stderr_path.as_ref(), append, force)?;
|
||||||
|
|
||||||
// delegate a thread to redirect stderr to result.
|
// delegate a thread to redirect stderr to result.
|
||||||
let handler = stderr.map(|stderr_stream| match stderr_file {
|
let handler = stderr.map(|stderr_stream| match stderr_file {
|
||||||
@ -127,7 +127,7 @@ impl Command for Save {
|
|||||||
PipelineData::ListStream(ls, _)
|
PipelineData::ListStream(ls, _)
|
||||||
if raw || prepare_path(&path, append, force)?.0.extension().is_none() =>
|
if raw || prepare_path(&path, append, force)?.0.extension().is_none() =>
|
||||||
{
|
{
|
||||||
let (mut file, _) = get_files(&path, &stderr_path, append, force)?;
|
let (mut file, _) = get_files(&path, stderr_path.as_ref(), append, force)?;
|
||||||
for val in ls {
|
for val in ls {
|
||||||
file.write_all(&value_to_bytes(val)?)
|
file.write_all(&value_to_bytes(val)?)
|
||||||
.map_err(|err| ShellError::IOError(err.to_string()))?;
|
.map_err(|err| ShellError::IOError(err.to_string()))?;
|
||||||
@ -143,7 +143,7 @@ impl Command for Save {
|
|||||||
input_to_bytes(input, Path::new(&path.item), raw, engine_state, stack, span)?;
|
input_to_bytes(input, Path::new(&path.item), raw, engine_state, stack, span)?;
|
||||||
|
|
||||||
// Only open file after successful conversion
|
// Only open file after successful conversion
|
||||||
let (mut file, _) = get_files(&path, &stderr_path, append, force)?;
|
let (mut file, _) = get_files(&path, stderr_path.as_ref(), append, force)?;
|
||||||
|
|
||||||
file.write_all(&bytes)
|
file.write_all(&bytes)
|
||||||
.map_err(|err| ShellError::IOError(err.to_string()))?;
|
.map_err(|err| ShellError::IOError(err.to_string()))?;
|
||||||
@ -317,7 +317,7 @@ fn open_file(path: &Path, span: Span, append: bool) -> Result<File, ShellError>
|
|||||||
/// Get output file and optional stderr file
|
/// Get output file and optional stderr file
|
||||||
fn get_files(
|
fn get_files(
|
||||||
path: &Spanned<PathBuf>,
|
path: &Spanned<PathBuf>,
|
||||||
stderr_path: &Option<Spanned<PathBuf>>,
|
stderr_path: Option<&Spanned<PathBuf>>,
|
||||||
append: bool,
|
append: bool,
|
||||||
force: bool,
|
force: bool,
|
||||||
) -> Result<(File, Option<File>), ShellError> {
|
) -> Result<(File, Option<File>), ShellError> {
|
||||||
|
@ -130,7 +130,7 @@ pub fn split_by(
|
|||||||
item: v.as_string()?,
|
item: v.as_string()?,
|
||||||
span: name,
|
span: name,
|
||||||
});
|
});
|
||||||
Ok(split(&splitter, input, name)?)
|
Ok(split(splitter.as_ref(), input, name)?)
|
||||||
}
|
}
|
||||||
// This uses the same format as the 'requires a column name' error in sort_utils.rs
|
// This uses the same format as the 'requires a column name' error in sort_utils.rs
|
||||||
None => Err(ShellError::GenericError(
|
None => Err(ShellError::GenericError(
|
||||||
@ -144,7 +144,7 @@ pub fn split_by(
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn split(
|
pub fn split(
|
||||||
column_name: &Option<Spanned<String>>,
|
column_name: Option<&Spanned<String>>,
|
||||||
values: PipelineData,
|
values: PipelineData,
|
||||||
span: Span,
|
span: Span,
|
||||||
) -> Result<PipelineData, ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
@ -156,24 +156,21 @@ pub fn split(
|
|||||||
|
|
||||||
match grouper {
|
match grouper {
|
||||||
Grouper::ByColumn(Some(column_name)) => {
|
Grouper::ByColumn(Some(column_name)) => {
|
||||||
let block =
|
let block = move |_, row: &Value| match row.get_data_by_key(&column_name.item) {
|
||||||
Box::new(
|
|
||||||
move |_, row: &Value| match row.get_data_by_key(&column_name.item) {
|
|
||||||
Some(group_key) => Ok(group_key.as_string()?),
|
Some(group_key) => Ok(group_key.as_string()?),
|
||||||
None => Err(ShellError::CantFindColumn {
|
None => Err(ShellError::CantFindColumn {
|
||||||
col_name: column_name.item.to_string(),
|
col_name: column_name.item.to_string(),
|
||||||
span: column_name.span,
|
span: column_name.span,
|
||||||
src_span: row.span(),
|
src_span: row.span(),
|
||||||
}),
|
}),
|
||||||
},
|
};
|
||||||
);
|
|
||||||
|
|
||||||
data_split(values, &Some(block), span)
|
data_split(values, Some(&block), span)
|
||||||
}
|
}
|
||||||
Grouper::ByColumn(None) => {
|
Grouper::ByColumn(None) => {
|
||||||
let block = Box::new(move |_, row: &Value| row.as_string());
|
let block = move |_, row: &Value| row.as_string();
|
||||||
|
|
||||||
data_split(values, &Some(block), span)
|
data_split(values, Some(&block), span)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -181,7 +178,7 @@ pub fn split(
|
|||||||
#[allow(clippy::type_complexity)]
|
#[allow(clippy::type_complexity)]
|
||||||
fn data_group(
|
fn data_group(
|
||||||
values: &Value,
|
values: &Value,
|
||||||
grouper: &Option<Box<dyn Fn(usize, &Value) -> Result<String, ShellError> + Send>>,
|
grouper: Option<&dyn Fn(usize, &Value) -> Result<String, ShellError>>,
|
||||||
span: Span,
|
span: Span,
|
||||||
) -> Result<Value, ShellError> {
|
) -> Result<Value, ShellError> {
|
||||||
let mut groups: IndexMap<String, Vec<Value>> = IndexMap::new();
|
let mut groups: IndexMap<String, Vec<Value>> = IndexMap::new();
|
||||||
@ -209,7 +206,7 @@ fn data_group(
|
|||||||
#[allow(clippy::type_complexity)]
|
#[allow(clippy::type_complexity)]
|
||||||
pub fn data_split(
|
pub fn data_split(
|
||||||
value: PipelineData,
|
value: PipelineData,
|
||||||
splitter: &Option<Box<dyn Fn(usize, &Value) -> Result<String, ShellError> + Send>>,
|
splitter: Option<&dyn Fn(usize, &Value) -> Result<String, ShellError>>,
|
||||||
span: Span,
|
span: Span,
|
||||||
) -> Result<PipelineData, ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let mut splits = indexmap::IndexMap::new();
|
let mut splits = indexmap::IndexMap::new();
|
||||||
|
@ -234,7 +234,7 @@ fn sort_attributes(val: Value) -> Value {
|
|||||||
|
|
||||||
fn generate_key(item: &ValueCounter) -> Result<String, ShellError> {
|
fn generate_key(item: &ValueCounter) -> Result<String, ShellError> {
|
||||||
let value = sort_attributes(item.val_to_compare.clone()); //otherwise, keys could be different for Records
|
let value = sort_attributes(item.val_to_compare.clone()); //otherwise, keys could be different for Records
|
||||||
value_to_string(&value, Span::unknown(), 0, &None)
|
value_to_string(&value, Span::unknown(), 0, None)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generate_results_with_count(head: Span, uniq_values: Vec<ValueCounter>) -> Vec<Value> {
|
fn generate_results_with_count(head: Span, uniq_values: Vec<ValueCounter>) -> Vec<Value> {
|
||||||
|
@ -61,15 +61,15 @@ impl Command for ToNuon {
|
|||||||
let value = input.into_value(span);
|
let value = input.into_value(span);
|
||||||
|
|
||||||
let nuon_result = if raw {
|
let nuon_result = if raw {
|
||||||
value_to_string(&value, span, 0, &None)
|
value_to_string(&value, span, 0, None)
|
||||||
} else if use_tabs {
|
} else if use_tabs {
|
||||||
let tab_count: usize = call.get_flag(engine_state, stack, "tabs")?.unwrap_or(1);
|
let tab_count: usize = call.get_flag(engine_state, stack, "tabs")?.unwrap_or(1);
|
||||||
value_to_string(&value, span, 0, &Some("\t".repeat(tab_count)))
|
value_to_string(&value, span, 0, Some(&"\t".repeat(tab_count)))
|
||||||
} else if use_indent {
|
} else if use_indent {
|
||||||
let indent: usize = call.get_flag(engine_state, stack, "indent")?.unwrap_or(2);
|
let indent: usize = call.get_flag(engine_state, stack, "indent")?.unwrap_or(2);
|
||||||
value_to_string(&value, span, 0, &Some(" ".repeat(indent)))
|
value_to_string(&value, span, 0, Some(&" ".repeat(indent)))
|
||||||
} else {
|
} else {
|
||||||
value_to_string(&value, span, 0, &None)
|
value_to_string(&value, span, 0, None)
|
||||||
};
|
};
|
||||||
|
|
||||||
match nuon_result {
|
match nuon_result {
|
||||||
@ -119,7 +119,7 @@ pub fn value_to_string(
|
|||||||
v: &Value,
|
v: &Value,
|
||||||
span: Span,
|
span: Span,
|
||||||
depth: usize,
|
depth: usize,
|
||||||
indent: &Option<String>,
|
indent: Option<&str>,
|
||||||
) -> Result<String, ShellError> {
|
) -> Result<String, ShellError> {
|
||||||
let (nl, sep) = get_true_separators(indent);
|
let (nl, sep) = get_true_separators(indent);
|
||||||
let idt = get_true_indentation(depth, indent);
|
let idt = get_true_indentation(depth, indent);
|
||||||
@ -290,14 +290,14 @@ pub fn value_to_string(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_true_indentation(depth: usize, indent: &Option<String>) -> String {
|
fn get_true_indentation(depth: usize, indent: Option<&str>) -> String {
|
||||||
match indent {
|
match indent {
|
||||||
Some(i) => i.repeat(depth),
|
Some(i) => i.repeat(depth),
|
||||||
None => "".to_string(),
|
None => "".to_string(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_true_separators(indent: &Option<String>) -> (String, String) {
|
fn get_true_separators(indent: Option<&str>) -> (String, String) {
|
||||||
match indent {
|
match indent {
|
||||||
Some(_) => ("\n".to_string(), "".to_string()),
|
Some(_) => ("\n".to_string(), "".to_string()),
|
||||||
None => ("".to_string(), " ".to_string()),
|
None => ("".to_string(), " ".to_string()),
|
||||||
@ -308,7 +308,7 @@ fn value_to_string_without_quotes(
|
|||||||
v: &Value,
|
v: &Value,
|
||||||
span: Span,
|
span: Span,
|
||||||
depth: usize,
|
depth: usize,
|
||||||
indent: &Option<String>,
|
indent: Option<&str>,
|
||||||
) -> Result<String, ShellError> {
|
) -> Result<String, ShellError> {
|
||||||
match v {
|
match v {
|
||||||
Value::String { val, .. } => Ok({
|
Value::String { val, .. } => Ok({
|
||||||
|
@ -3595,7 +3595,8 @@ pub fn parse_register(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipe
|
|||||||
|
|
||||||
let signatures = signature.map_or_else(
|
let signatures = signature.map_or_else(
|
||||||
|| {
|
|| {
|
||||||
let signatures = get_signature(&path, &shell, ¤t_envs).map_err(|err| {
|
let signatures =
|
||||||
|
get_signature(&path, shell.as_deref(), ¤t_envs).map_err(|err| {
|
||||||
ParseError::LabeledError(
|
ParseError::LabeledError(
|
||||||
"Error getting signatures".into(),
|
"Error getting signatures".into(),
|
||||||
err.to_string(),
|
err.to_string(),
|
||||||
|
@ -66,7 +66,7 @@ impl Command for PluginDeclaration {
|
|||||||
// Decode information from plugin
|
// Decode information from plugin
|
||||||
// Create PipelineData
|
// Create PipelineData
|
||||||
let source_file = Path::new(&self.filename);
|
let source_file = Path::new(&self.filename);
|
||||||
let mut plugin_cmd = create_command(source_file, &self.shell);
|
let mut plugin_cmd = create_command(source_file, self.shell.as_deref());
|
||||||
// We need the current environment variables for `python` based plugins
|
// We need the current environment variables for `python` based plugins
|
||||||
// Or we'll likely have a problem when a plugin is implemented in a virtual Python environment.
|
// Or we'll likely have a problem when a plugin is implemented in a virtual Python environment.
|
||||||
let current_envs = nu_engine::env::env_to_strings(engine_state, stack).unwrap_or_default();
|
let current_envs = nu_engine::env::env_to_strings(engine_state, stack).unwrap_or_default();
|
||||||
@ -175,7 +175,7 @@ impl Command for PluginDeclaration {
|
|||||||
pipeline_data
|
pipeline_data
|
||||||
}
|
}
|
||||||
|
|
||||||
fn is_plugin(&self) -> Option<(&PathBuf, &Option<PathBuf>)> {
|
fn is_plugin(&self) -> Option<(&Path, Option<&Path>)> {
|
||||||
Some((&self.filename, &self.shell))
|
Some((&self.filename, self.shell.as_deref()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,7 @@ use crate::EncodingType;
|
|||||||
use std::env;
|
use std::env;
|
||||||
use std::fmt::Write;
|
use std::fmt::Write;
|
||||||
use std::io::{BufReader, ErrorKind, Read, Write as WriteTrait};
|
use std::io::{BufReader, ErrorKind, Read, Write as WriteTrait};
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::Path;
|
||||||
use std::process::{Child, ChildStdout, Command as CommandSys, Stdio};
|
use std::process::{Child, ChildStdout, Command as CommandSys, Stdio};
|
||||||
|
|
||||||
use nu_protocol::{CustomValue, PluginSignature, ShellError, Span, Value};
|
use nu_protocol::{CustomValue, PluginSignature, ShellError, Span, Value};
|
||||||
@ -48,7 +48,7 @@ pub trait PluginEncoder: Clone {
|
|||||||
) -> Result<PluginResponse, ShellError>;
|
) -> Result<PluginResponse, ShellError>;
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn create_command(path: &Path, shell: &Option<PathBuf>) -> CommandSys {
|
pub(crate) fn create_command(path: &Path, shell: Option<&Path>) -> CommandSys {
|
||||||
let mut process = match (path.extension(), shell) {
|
let mut process = match (path.extension(), shell) {
|
||||||
(_, Some(shell)) => {
|
(_, Some(shell)) => {
|
||||||
let mut process = std::process::Command::new(shell);
|
let mut process = std::process::Command::new(shell);
|
||||||
@ -124,7 +124,7 @@ pub(crate) fn call_plugin(
|
|||||||
#[doc(hidden)] // Note: not for plugin authors / only used in nu-parser
|
#[doc(hidden)] // Note: not for plugin authors / only used in nu-parser
|
||||||
pub fn get_signature(
|
pub fn get_signature(
|
||||||
path: &Path,
|
path: &Path,
|
||||||
shell: &Option<PathBuf>,
|
shell: Option<&Path>,
|
||||||
current_envs: &HashMap<String, String>,
|
current_envs: &HashMap<String, String>,
|
||||||
) -> Result<Vec<PluginSignature>, ShellError> {
|
) -> Result<Vec<PluginSignature>, ShellError> {
|
||||||
let mut plugin_cmd = create_command(path, shell);
|
let mut plugin_cmd = create_command(path, shell);
|
||||||
|
@ -45,7 +45,7 @@ impl CustomValue for PluginCustomValue {
|
|||||||
&self,
|
&self,
|
||||||
span: nu_protocol::Span,
|
span: nu_protocol::Span,
|
||||||
) -> Result<nu_protocol::Value, nu_protocol::ShellError> {
|
) -> Result<nu_protocol::Value, nu_protocol::ShellError> {
|
||||||
let mut plugin_cmd = create_command(&self.filename, &self.shell);
|
let mut plugin_cmd = create_command(&self.filename, self.shell.as_deref());
|
||||||
|
|
||||||
let mut child = plugin_cmd.spawn().map_err(|err| {
|
let mut child = plugin_cmd.spawn().map_err(|err| {
|
||||||
ShellError::GenericError(
|
ShellError::GenericError(
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
use std::path::PathBuf;
|
use std::path::Path;
|
||||||
|
|
||||||
use crate::{ast::Call, Alias, BlockId, Example, PipelineData, ShellError, Signature};
|
use crate::{ast::Call, Alias, BlockId, Example, PipelineData, ShellError, Signature};
|
||||||
|
|
||||||
@ -92,7 +92,7 @@ pub trait Command: Send + Sync + CommandClone {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Is a plugin command (returns plugin's path, type of shell if the declaration is a plugin)
|
// Is a plugin command (returns plugin's path, type of shell if the declaration is a plugin)
|
||||||
fn is_plugin(&self) -> Option<(&PathBuf, &Option<PathBuf>)> {
|
fn is_plugin(&self) -> Option<(&Path, Option<&Path>)> {
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -210,7 +210,7 @@ pub(crate) fn set_config_path(
|
|||||||
cwd: &Path,
|
cwd: &Path,
|
||||||
default_config_name: &str,
|
default_config_name: &str,
|
||||||
key: &str,
|
key: &str,
|
||||||
config_file: &Option<Spanned<String>>,
|
config_file: Option<&Spanned<String>>,
|
||||||
) {
|
) {
|
||||||
let config_path = match config_file {
|
let config_path = match config_file {
|
||||||
Some(s) => canonicalize_with(&s.item, cwd).ok(),
|
Some(s) => canonicalize_with(&s.item, cwd).ok(),
|
||||||
|
@ -129,7 +129,7 @@ fn main() -> Result<()> {
|
|||||||
&init_cwd,
|
&init_cwd,
|
||||||
"config.nu",
|
"config.nu",
|
||||||
"config-path",
|
"config-path",
|
||||||
&parsed_nu_cli_args.config_file,
|
parsed_nu_cli_args.config_file.as_ref(),
|
||||||
);
|
);
|
||||||
|
|
||||||
set_config_path(
|
set_config_path(
|
||||||
@ -137,7 +137,7 @@ fn main() -> Result<()> {
|
|||||||
&init_cwd,
|
&init_cwd,
|
||||||
"env.nu",
|
"env.nu",
|
||||||
"env-path",
|
"env-path",
|
||||||
&parsed_nu_cli_args.env_file,
|
parsed_nu_cli_args.env_file.as_ref(),
|
||||||
);
|
);
|
||||||
perf(
|
perf(
|
||||||
"set_config_path",
|
"set_config_path",
|
||||||
|
Loading…
Reference in New Issue
Block a user