extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 05:14:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use record API in more parts of nu-protocol (#10928)

Browse Source 
# Description

This is pretty complementary/orthogonal to @IanManske 's changes to
`Value` cellpath accessors in:
- #10925
- to a lesser extent #10926

## Steps
- Use `R.remove` in `Value.remove_data_at_cell_path`
- Pretty sound after #10875 (tests mentioned in commit message have been
removed by that)
- Update `did_you_mean` helper to use iterator
- Change `Value::columns` to return iterator
  - This is not a place of honor
- Use `Record::get` in `Value::get_data_by_key`
# User-Facing Changes
None intentional, potential edge cases on duplicated columns could
change (considered undefined behavior)

# Tests + Formatting
(-)
This commit is contained in:
Stefan Holderbach
2023-11-08 23:03:08 +01:00
committed by GitHub
parent 44c0db46e1
commit 92503e6571
6 changed files with 22 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
crates/nu-protocol/src/value/mod.rs
View File

@ -1035,7 +1035,9 @@ impl Value {
return Ok(Value::nothing(*origin_span)); // short-circuit
} else {
if from_user_input {
if let Some(suggestion) = did_you_mean(&val.cols, column_name) {
if let Some(suggestion) =
did_you_mean(val.columns(), column_name)
{
return Err(ShellError::DidYouMean(
suggestion,
*origin_span,
@ -1420,19 +1422,7 @@ impl Value {
match val {
Value::Record { val: record, .. } => {
let mut found = false;
let mut index = 0;
record.cols.retain_mut(|col| {
if col == col_name {
found = true;
record.vals.remove(index);
false
} else {
index += 1;
true
}
});
if !found && !optional {
if record.remove(col_name).is_none() && !optional {
return Err(ShellError::CantFindColumn {
col_name: col_name.to_string(),
span: *span,
@ -1452,19 +1442,7 @@ impl Value {
Ok(())
}
Value::Record { val: record, .. } => {
let mut found = false;
let mut index = 0;
record.cols.retain_mut(|col| {
if col == col_name {
found = true;
record.vals.remove(index);
false
} else {
index += 1;
true
}
});
if !found && !optional {
if record.remove(col_name).is_none() && !optional {
return Err(ShellError::CantFindColumn {
col_name: col_name.to_string(),
span: *span,
@ -1741,11 +1719,13 @@ impl Value {
matches!(self, Value::Bool { val: false, .. })
}
pub fn columns(&self) -> &[String] {
match self {
Value::Record { val, .. } => &val.cols,
_ => &[],
}
pub fn columns(&self) -> impl Iterator<Item = &String> {
let opt = match self {
Value::Record { val, .. } => Some(val.columns()),
_ => None,
};
opt.into_iter().flatten()
}
pub fn bool(val: bool, span: Span) -> Value {