extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-06-07 10:36:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile errors

Browse Source
This commit is contained in:
Ian Manske 2024-04-22 17:50:31 -04:00
parent 16c8c6cd7d
commit 7e38cc0363
51 changed files with 114 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-cmd-base/src/hook.rs
View File

@ -18,7 +18,7 @@ pub fn eval_env_change_hook(
if let Some(hook) = env_change_hook {
match hook {
Value::Record { val, .. } => {
for (env_name, hook_value) in &*val {
for (env_name, hook_value) in &val {
let before = engine_state
.previous_env_vars
.get(env_name)

2
crates/nu-cmd-extra/src/extra/filters/roll/mod.rs
View File

@ -58,7 +58,7 @@ fn horizontal_rotate_value(
Value::Record { val: record, .. } => {
let rotations = by.map(|n| n % record.len()).unwrap_or(1);
let (mut cols, mut vals): (Vec<_>, Vec<_>) = record.into_owned().into_iter().unzip();
let (mut cols, mut vals): (Vec<_>, Vec<_>) = record.into_iter().unzip();
if !cells_only {
match direction {
HorizontalDirection::Right => cols.rotate_right(rotations),

2
crates/nu-cmd-extra/src/extra/filters/rotate.rs
View File

@ -171,7 +171,7 @@ pub fn rotate(
let span = val.span();
match val {
Value::Record { val: record, .. } => {
let (cols, vals): (Vec<_>, Vec<_>) = record.into_owned().into_iter().unzip();
let (cols, vals): (Vec<_>, Vec<_>) = record.into_iter().unzip();
old_column_names = cols;
new_values.extend_from_slice(&vals);
}

1
crates/nu-cmd-extra/src/extra/filters/update_cells.rs
View File

@ -127,7 +127,6 @@ impl Iterator for UpdateCellIterator {
let mut value = self.iter.next()?;
let value = if let Value::Record { val, .. } = &mut value {
let val = val.to_mut();
if let Some(columns) = &self.columns {
for (col, val) in val.iter_mut() {
if columns.contains(col) {

5
crates/nu-cmd-lang/src/core_commands/describe.rs
View File

@ -264,7 +264,7 @@ fn compact_primitive_description(mut value: Value) -> Value {
if val.len() != 1 {
return value;
}
if let Some(type_name) = val.to_mut().get_mut("type") {
if let Some(type_name) = val.get_mut("type") {
return std::mem::take(type_name);
}
}
@ -300,8 +300,7 @@ fn describe_value(
),
head,
),
Value::Record { val, .. } => {
let mut val = val.into_owned();
Value::Record { mut val, .. } => {
for (_k, v) in val.iter_mut() {
*v = compact_primitive_description(describe_value(
std::mem::take(v),

2
crates/nu-cmd-lang/src/example_support.rs
View File

@ -269,7 +269,7 @@ impl<'a> std::fmt::Debug for DebuggableValue<'a> {
Value::Record { val, .. } => {
write!(f, "{{")?;
let mut first = true;
for (col, value) in (&**val).into_iter() {
for (col, value) in val {
if !first {
write!(f, ", ")?;
}

3
crates/nu-command/src/conversions/into/value.rs
View File

@ -108,8 +108,7 @@ impl Iterator for UpdateCellIterator {
let span = val.span();
match val {
Value::Record { val, .. } => Some(Value::record(
val.into_owned()
.into_iter()
val.into_iter()
.map(|(col, val)| match &self.columns {
Some(cols) if !cols.contains(&col) => (col, val),
_ => (

2
crates/nu-command/src/database/values/sqlite.rs
View File

@ -500,7 +500,7 @@ pub fn nu_value_to_params(value: Value) -> Result<NuSqlParams, ShellError> {
Value::Record { val, .. } => {
let mut params = Vec::with_capacity(val.len());
for (mut column, value) in val.into_owned().into_iter() {
for (mut column, value) in val {
let sql_type_erased = value_to_sql(value)?;
if !column.starts_with([':', '@', '$']) {

2
crates/nu-command/src/debug/inspect_table.rs
View File

@ -199,7 +199,7 @@ mod util {
let span = value.span();
match value {
Value::Record { val: record, .. } => {
let (cols, vals): (Vec<_>, Vec<_>) = record.into_owned().into_iter().unzip();
let (cols, vals): (Vec<_>, Vec<_>) = record.into_iter().unzip();
(
cols,
vec![vals

2
crates/nu-command/src/env/load_env.rs vendored
View File

@ -40,7 +40,7 @@ impl Command for LoadEnv {
let record = match arg {
Some(record) => record,
None => match input {
PipelineData::Value(Value::Record { val, .. }, ..) => val.into_owned(),
PipelineData::Value(Value::Record { val, .. }, ..) => val,
_ => {
return Err(ShellError::UnsupportedInput {
msg: "'load-env' expects a single record".into(),

4
crates/nu-command/src/env/with_env.rs vendored
View File

@ -82,7 +82,7 @@ fn with_env(
// single row([[X W]; [Y Z]])
match &table[0] {
Value::Record { val, .. } => {
for (k, v) in &**val {
for (k, v) in val {
env.insert(k.to_string(), v.clone());
}
}
@ -116,7 +116,7 @@ fn with_env(
}
// when get object by `open x.json` or `from json`
Value::Record { val, .. } => {
for (k, v) in &**val {
for (k, v) in val {
env.insert(k.clone(), v.clone());
}
}

1
crates/nu-command/src/filters/columns.rs
View File

@ -118,7 +118,6 @@ fn getcol(
})
}
Value::Record { val, .. } => Ok(val
.into_owned()
.into_iter()
.map(move |(x, _)| Value::string(x, head))
.into_pipeline_data(ctrlc)

4
crates/nu-command/src/filters/default.rs
View File

@ -92,7 +92,7 @@ fn default(
} => {
let mut found = false;
for (col, val) in record.to_mut().iter_mut() {
for (col, val) in record.iter_mut() {
if *col == column.item {
found = true;
if matches!(val, Value::Nothing { .. }) {
@ -102,7 +102,7 @@ fn default(
}
if !found {
record.to_mut().push(column.item.clone(), value.clone());
record.push(column.item.clone(), value.clone());
}
item

6
crates/nu-command/src/filters/drop/column.rs
View File

@ -123,7 +123,7 @@ fn drop_cols(
..
} => {
let len = record.len().saturating_sub(columns);
record.to_mut().truncate(len);
record.truncate(len);
Ok(v.into_pipeline_data_with_metadata(metadata))
}
// Propagate errors
@ -144,7 +144,7 @@ fn drop_cols(
fn drop_cols_set(val: &mut Value, head: Span, drop: usize) -> Result<HashSet<String>, ShellError> {
if let Value::Record { val: record, .. } = val {
let len = record.len().saturating_sub(drop);
Ok(record.to_mut().drain(len..).map(|(col, _)| col).collect())
Ok(record.drain(len..).map(|(col, _)| col).collect())
} else {
Err(unsupported_value_error(val, head))
}
@ -156,7 +156,7 @@ fn drop_record_cols(
drop_cols: &HashSet<String>,
) -> Result<(), ShellError> {
if let Value::Record { val, .. } = val {
val.to_mut().retain(|col, _| !drop_cols.contains(col));
val.retain(|col, _| !drop_cols.contains(col));
Ok(())
} else {
Err(unsupported_value_error(val, head))

4
crates/nu-command/src/filters/flatten.rs
View File

@ -156,7 +156,7 @@ fn flat_value(columns: &[CellPath], item: Value, all: bool) -> Vec<Value> {
let mut out = IndexMap::<String, Value>::new();
let mut inner_table = None;
for (column_index, (column, value)) in val.into_owned().into_iter().enumerate() {
for (column_index, (column, value)) in val.into_iter().enumerate() {
let column_requested = columns.iter().find(|c| c.to_string() == column);
let need_flatten = { columns.is_empty() || column_requested.is_some() };
let span = value.span();
@ -164,7 +164,7 @@ fn flat_value(columns: &[CellPath], item: Value, all: bool) -> Vec<Value> {
match value {
Value::Record { ref val, .. } => {
if need_flatten {
for (col, val) in val.clone().into_owned() {
for (col, val) in val.clone() {
if out.contains_key(&col) {
out.insert(format!("{column}_{col}"), val);
} else {

1
crates/nu-command/src/filters/headers.rs
View File

@ -149,7 +149,6 @@ fn replace_headers(
if let Value::Record { val: record, .. } = value {
Ok(Value::record(
record
.into_owned()
.into_iter()
.filter_map(|(col, val)| {
old_headers

1
crates/nu-command/src/filters/items.rs
View File

@ -55,7 +55,6 @@ impl Command for Items {
Value::Record { val, .. } => {
let mut closure = ClosureEval::new(engine_state, stack, closure);
Ok(val
.into_owned()
.into_iter()
.map_while(move |(col, val)| {
let result = closure

7
crates/nu-command/src/filters/rename.rs
View File

@ -148,8 +148,7 @@ fn rename(
Value::Record { val: record, .. } => {
let record =
if let Some(closure) = &mut closure {
record
.into_owned().into_iter()
record.into_iter()
.map(|(col, val)| {
let col = Value::string(col, span);
let data = closure.run_with_value(col)?;
@ -163,7 +162,7 @@ fn rename(
// record columns are unique so we can track the number
// of renamed columns to check if any were missed
let mut renamed = 0;
let record = record.into_owned().into_iter().map(|(col, val)| {
let record = record.into_iter().map(|(col, val)| {
let col = if let Some(col) = columns.get(&col) {
renamed += 1;
col.clone()
@ -194,7 +193,7 @@ fn rename(
}
}
None => Ok(record
.into_owned().into_iter()
.into_iter()
.enumerate()
.map(|(i, (col, val))| {
(columns.get(i).cloned().unwrap_or(col), val)

9
crates/nu-command/src/filters/sort.rs
View File

@ -144,14 +144,7 @@ impl Command for Sort {
// Records have two sorting methods, toggled by presence or absence of -v
PipelineData::Value(Value::Record { val, .. }, ..) => {
let sort_by_value = call.has_flag(engine_state, stack, "values")?;
let record = sort_record(
val.into_owned(),
span,
sort_by_value,
reverse,
insensitive,
natural,
);
let record = sort_record(val, span, sort_by_value, reverse, insensitive, natural);
Ok(record.into_pipeline_data())
}
// Other values are sorted here

4
crates/nu-command/src/filters/split_by.rs
View File

@ -187,11 +187,11 @@ pub fn data_split(
let span = v.span();
match v {
Value::Record { val: grouped, .. } => {
for (outer_key, list) in grouped.into_owned() {
for (outer_key, list) in grouped {
match data_group(&list, splitter, span) {
Ok(grouped_vals) => {
if let Value::Record { val: sub, .. } = grouped_vals {
for (inner_key, subset) in sub.into_owned() {
for (inner_key, subset) in sub {
let s: &mut IndexMap<String, Value> =
splits.entry(inner_key).or_default();

1
crates/nu-command/src/filters/uniq.rs
View File

@ -194,7 +194,6 @@ fn sort_attributes(val: Value) -> Value {
Value::Record { val, .. } => {
// TODO: sort inplace
let sorted = val
.into_owned()
.into_iter()
.sorted_by(|a, b| a.0.cmp(&b.0))
.collect_vec();

3
crates/nu-command/src/filters/values.rs
View File

@ -106,7 +106,7 @@ pub fn get_values<'a>(
for item in input {
match item {
Value::Record { val, .. } => {
for (k, v) in &**val {
for (k, v) in val {
if let Some(vec) = output.get_mut(k) {
vec.push(v.clone());
} else {
@ -171,7 +171,6 @@ fn values(
})?,
};
Ok(record
.into_owned()
.into_values()
.into_pipeline_data_with_metadata(metadata, ctrlc))
}

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

@ -130,7 +130,7 @@ pub fn value_to_json_value(v: &Value) -> Result<nu_json::Value, ShellError> {
}
Value::Record { val, .. } => {
let mut m = nu_json::Map::new();
for (k, v) in &**val {
for (k, v) in val {
m.insert(k.clone(), value_to_json_value(v)?);
}
nu_json::Value::Object(m)

1
crates/nu-command/src/formats/to/text.rs
View File

@ -125,7 +125,6 @@ fn local_into_string(value: Value, separator: &str, config: &Config) -> String {
.collect::<Vec<_>>()
.join(separator),
Value::Record { val, .. } => val
.into_owned()
.into_iter()
.map(|(x, y)| format!("{}: {}", x, local_into_string(y, ", ", config)))
.collect::<Vec<_>>()

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

@ -57,7 +57,7 @@ fn helper(engine_state: &EngineState, v: &Value) -> Result<toml::Value, ShellErr
Value::String { val, .. } | Value::Glob { val, .. } => toml::Value::String(val.clone()),
Value::Record { val, .. } => {
let mut m = toml::map::Map::new();
for (k, v) in &**val {
for (k, v) in val {
m.insert(k.clone(), helper(engine_state, v)?);
}
toml::Value::Table(m)

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

@ -325,7 +325,7 @@ impl Job {
// alternatives like {tag: a attributes: {} content: []}, {tag: a attribbutes: null
// content: null}, {tag: a}. See to_xml_entry for more
let attrs = match attrs {
Value::Record { val, .. } => val.into_owned(),
Value::Record { val, .. } => val,
Value::Nothing { .. } => Record::new(),
_ => {
return Err(ShellError::CantConvert {

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

@ -54,7 +54,7 @@ pub fn value_to_yaml_value(v: &Value) -> Result<serde_yaml::Value, ShellError> {
}
Value::Record { val, .. } => {
let mut m = serde_yaml::Mapping::new();
for (k, v) in &**val {
for (k, v) in val {
m.insert(
serde_yaml::Value::String(k.clone()),
value_to_yaml_value(v)?,

2
crates/nu-command/src/generators/generate.rs
View File

@ -112,7 +112,7 @@ used as the next argument to the closure, otherwise generation stops.
match value {
// {out: ..., next: ...} -> output and continue
Value::Record { val, .. } => {
let iter = val.into_owned().into_iter();
let iter = val.into_iter();
let mut out = None;
let mut next = None;
let mut err = None;

2
crates/nu-command/src/help/help_.rs
View File

@ -152,7 +152,7 @@ pub fn highlight_search_in_table(
});
};
let has_match = record.to_mut().iter_mut().try_fold(
let has_match = record.iter_mut().try_fold(
false,
|acc: bool, (col, val)| -> Result<bool, ShellError> {
if !searched_cols.contains(&col.as_str()) {

10
crates/nu-command/src/math/utils.rs
View File

@ -27,7 +27,7 @@ fn helper_for_tables(
for val in values {
match val {
Value::Record { val, .. } => {
for (key, value) in &**val {
for (key, value) in val {
column_values
.entry(key.clone())
.and_modify(|v: &mut Vec<Value>| v.push(value.clone()))
@ -80,15 +80,13 @@ pub fn calculate(
),
_ => mf(vals, span, name),
},
PipelineData::Value(Value::Record { val, .. }, ..) => {
let mut record = val.into_owned();
record
.iter_mut()
PipelineData::Value(Value::Record { mut val, .. }, ..) => {
val.iter_mut()
.try_for_each(|(_, val)| -> Result<(), ShellError> {
*val = mf(slice::from_ref(val), span, name)?;
Ok(())
})?;
Ok(Value::record(record, span))
Ok(Value::record(val, span))
}
PipelineData::Value(Value::Range { val, .. }, ..) => {
let new_vals: Result<Vec<Value>, ShellError> = val

6
crates/nu-command/src/network/http/client.rs
View File

@ -222,7 +222,7 @@ pub fn send_request(
Value::Record { val, .. } if body_type == BodyType::Form => {
let mut data: Vec<(String, String)> = Vec::with_capacity(val.len());
for (col, val) in val.into_owned() {
for (col, val) in val {
data.push((col, val.coerce_into_string()?))
}
@ -336,7 +336,7 @@ pub fn request_add_custom_headers(
match &headers {
Value::Record { val, .. } => {
for (k, v) in &**val {
for (k, v) in val {
custom_headers.insert(k.to_string(), v.clone());
}
}
@ -346,7 +346,7 @@ pub fn request_add_custom_headers(
// single row([key1 key2]; [val1 val2])
match &table[0] {
Value::Record { val, .. } => {
for (k, v) in &**val {
for (k, v) in val {
custom_headers.insert(k.to_string(), v.clone());
}
}

2
crates/nu-command/src/network/url/build_query.rs
View File

@ -65,7 +65,7 @@ fn to_url(input: PipelineData, head: Span) -> Result<PipelineData, ShellError> {
match value {
Value::Record { ref val, .. } => {
let mut row_vec = vec![];
for (k, v) in &**val {
for (k, v) in val {
match v.coerce_string() {
Ok(s) => {
row_vec.push((k.clone(), s));

2
crates/nu-command/src/network/url/join.rs
View File

@ -92,7 +92,6 @@ impl Command for SubCommand {
match value {
Value::Record { val, .. } => {
let url_components = val
.into_owned()
.into_iter()
.try_fold(UrlComponents::new(), |url, (k, v)| {
url.add_component(k, v, span, engine_state)
@ -180,7 +179,6 @@ impl UrlComponents {
return match value {
Value::Record { val, .. } => {
let mut qs = val
.into_owned()
.into_iter()
.map(|(k, v)| match v.coerce_into_string() {
Ok(val) => Ok(format!("{k}={val}")),

2
crates/nu-command/src/viewers/griddle.rs
View File

@ -108,7 +108,7 @@ prints out the list properly."#
// dbg!("value::record");
let mut items = vec![];
for (i, (c, v)) in val.into_owned().into_iter().enumerate() {
for (i, (c, v)) in val.into_iter().enumerate() {
items.push((i, c, v.to_expanded_string(", ", config)))
}

6
crates/nu-command/src/viewers/table.rs
View File

@ -392,7 +392,7 @@ fn handle_table_command(
}
PipelineData::Value(Value::Record { val, .. }, ..) => {
input.data = PipelineData::Empty;
handle_record(input, cfg, val.into_owned())
handle_record(input, cfg, val)
}
PipelineData::Value(Value::LazyRecord { val, .. }, ..) => {
input.data = val.collect()?.into_pipeline_data();
@ -557,7 +557,7 @@ fn handle_row_stream(
stream.map(move |mut x| match &mut x {
Value::Record { val: record, .. } => {
// Only the name column gets special colors, for now
if let Some(value) = record.to_mut().get_mut("name") {
if let Some(value) = record.get_mut("name") {
let span = value.span();
if let Value::String { val, .. } = value {
if let Some(val) = render_path_name(val, &config, &ls_colors, span)
@ -583,7 +583,7 @@ fn handle_row_stream(
ListStream::from_stream(
stream.map(move |mut x| match &mut x {
Value::Record { val: record, .. } => {
for (rec_col, rec_val) in record.to_mut().iter_mut() {
for (rec_col, rec_val) in record.iter_mut() {
// Every column in the HTML theme table except 'name' is colored
if rec_col != "name" {
continue;

2
crates/nu-engine/src/documentation.rs
View File

@ -376,7 +376,7 @@ fn get_argument_for_color_value(
) -> Option<Argument> {
match color {
Value::Record { val, .. } => {
let record_exp: Vec<RecordItem> = (**val)
let record_exp: Vec<RecordItem> = val
.iter()
.map(|(k, v)| {
RecordItem::Pair(

2
crates/nu-explore/src/nu_common/value.rs
View File

@ -87,7 +87,7 @@ pub fn collect_input(value: Value) -> (Vec<String>, Vec<Vec<Value>>) {
let span = value.span();
match value {
Value::Record { val: record, .. } => {
let (key, val) = record.into_owned().into_iter().unzip();
let (key, val) = record.into_iter().unzip();
(key, vec![val])
}
Value::List { vals, .. } => {

2
crates/nu-explore/src/pager/mod.rs
View File

@ -1038,7 +1038,7 @@ fn set_config(hm: &mut HashMap<String, Value>, path: &[&str], value: Value) -> b
if path.len() == 2 {
let key = path[1];
record.to_mut().insert(key, value);
record.insert(key, value);
} else {
let mut hm2: HashMap<String, Value> = HashMap::new();
for (k, v) in record.iter() {

4
crates/nu-plugin-test-support/src/plugin_test.rs
View File

@ -319,8 +319,8 @@ impl PluginTest {
// reorder cols and vals to make more logically compare.
// more general, if two record have same col and values,
// the order of cols shouldn't affect the equal property.
let mut a_rec = a_rec.clone().into_owned();
let mut b_rec = b_rec.clone().into_owned();
let mut a_rec = a_rec.clone();
let mut b_rec = b_rec.clone();
a_rec.sort_cols();
b_rec.sort_cols();

2
crates/nu-protocol/src/config/hooks.rs
View File

@ -39,7 +39,7 @@ pub(super) fn create_hooks(value: &Value) -> Result<Hooks, ShellError> {
Value::Record { val, .. } => {
let mut hooks = Hooks::new();
for (col, val) in &**val {
for (col, val) in val {
match col.as_str() {
"pre_prompt" => hooks.pre_prompt = Some(val.clone()),
"pre_execution" => hooks.pre_execution = Some(val.clone()),

22
crates/nu-protocol/src/config/mod.rs
View File

@ -202,13 +202,13 @@ impl Value {
// the `2`.
if let Value::Record { val, .. } = self {
val.to_mut().retain_mut(|key, value| {
val.retain_mut(|key, value| {
let span = value.span();
match key {
// Grouped options
"ls" => {
if let Value::Record { val, .. } = value {
val.to_mut().retain_mut(|key2, value| {
val.retain_mut(|key2, value| {
let span = value.span();
match key2 {
"use_ls_colors" => {
@ -237,7 +237,7 @@ impl Value {
}
"rm" => {
if let Value::Record { val, .. } = value {
val.to_mut().retain_mut(|key2, value| {
val.retain_mut(|key2, value| {
let span = value.span();
match key2 {
"always_trash" => {
@ -264,7 +264,7 @@ impl Value {
"history" => {
let history = &mut config.history;
if let Value::Record { val, .. } = value {
val.to_mut().retain_mut(|key2, value| {
val.retain_mut(|key2, value| {
let span = value.span();
match key2 {
"isolation" => {
@ -306,7 +306,7 @@ impl Value {
}
"completions" => {
if let Value::Record { val, .. } = value {
val.to_mut().retain_mut(|key2, value| {
val.retain_mut(|key2, value| {
let span = value.span();
match key2 {
"quick" => {
@ -327,7 +327,7 @@ impl Value {
}
"external" => {
if let Value::Record { val, .. } = value {
val.to_mut().retain_mut(|key3, value|
val.retain_mut(|key3, value|
{
let span = value.span();
match key3 {
@ -394,7 +394,7 @@ impl Value {
}
"cursor_shape" => {
if let Value::Record { val, .. } = value {
val.to_mut().retain_mut(|key2, value| {
val.retain_mut(|key2, value| {
let span = value.span();
let config_point = match key2 {
"vi_insert" => &mut config.cursor_shape_vi_insert,
@ -427,7 +427,7 @@ impl Value {
}
"table" => {
if let Value::Record { val, .. } = value {
val.to_mut().retain_mut(|key2, value| {
val.retain_mut(|key2, value| {
let span = value.span();
match key2 {
"mode" => {
@ -452,7 +452,7 @@ impl Value {
}
Value::Record { val, .. } => {
let mut invalid = false;
val.to_mut().retain(|key3, value| {
val.retain(|key3, value| {
match key3 {
"left" => {
match value.as_int() {
@ -547,7 +547,7 @@ impl Value {
}
"filesize" => {
if let Value::Record { val, .. } = value {
val.to_mut().retain_mut(|key2, value| {
val.retain_mut(|key2, value| {
let span = value.span();
match key2 {
"metric" => {
@ -720,7 +720,7 @@ impl Value {
},
"datetime_format" => {
if let Value::Record { val, .. } = value {
val.to_mut().retain_mut(|key2, value|
val.retain_mut(|key2, value|
{
let span = value.span();
match key2 {

6
crates/nu-protocol/src/config/plugin_gc.rs
View File

@ -39,7 +39,7 @@ impl PluginGcConfigs {
self.plugins = HashMap::new();
}
val.to_mut().retain_mut(|key, value| {
val.retain_mut(|key, value| {
let span = value.span();
match key {
"default" => {
@ -88,7 +88,7 @@ fn process_plugins(
// Remove any plugin configs that aren't in the value
plugins.retain(|key, _| val.contains(key));
val.to_mut().retain_mut(|key, value| {
val.retain_mut(|key, value| {
if matches!(value, Value::Record { .. }) {
plugins.entry(key.to_owned()).or_default().process(
&join_path(path, &[key]),
@ -150,7 +150,7 @@ impl PluginGcConfig {
self.stop_after = PluginGcConfig::default().stop_after;
}
val.to_mut().retain_mut(|key, value| {
val.retain_mut(|key, value| {
let span = value.span();
match key {
"enabled" => process_bool_config(value, errors, &mut self.enabled),

2
crates/nu-protocol/src/engine/pattern_match.rs
View File

@ -23,7 +23,7 @@ impl Matcher for Pattern {
Pattern::Record(field_patterns) => match value {
Value::Record { val, .. } => {
'top: for field_pattern in field_patterns {
for (col, val) in &**val {
for (col, val) in val {
if col == &field_pattern.0 {
// We have found the field
let result = field_pattern.1.match_value(val, matches);

2
crates/nu-protocol/src/eval_base.rs
View File

@ -75,7 +75,7 @@ pub trait Eval {
RecordItem::Spread(_, inner) => {
match Self::eval::<D>(state, mut_state, inner)? {
Value::Record { val: inner_val, .. } => {
for (col_name, val) in inner_val.into_owned() {
for (col_name, val) in inner_val {
if let Some(orig_span) = col_names.get(&col_name) {
return Err(ShellError::ColumnDefinedTwice {
col_name,

2
crates/nu-protocol/src/value/from_value.rs
View File

@ -538,7 +538,7 @@ impl FromValue for Vec<Value> {
impl FromValue for Record {
fn from_value(v: Value) -> Result<Self, ShellError> {
match v {
Value::Record { val, .. } => Ok(val.into_owned()),
Value::Record { val, .. } => Ok(val),
v => Err(ShellError::CantConvert {
to_type: "Record".into(),
from_type: v.get_type().to_string(),

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

@ -29,7 +29,7 @@ use fancy_regex::Regex;
use nu_utils::{
contains_emoji,
locale::{get_system_locale_string, LOCALE_OVERRIDE_ENV_VAR},
IgnoreCaseExt, SharedCow,
IgnoreCaseExt,
};
use serde::{Deserialize, Serialize};
use std::{
@ -527,7 +527,7 @@ impl Value {
/// Unwraps the inner [`Record`] value or returns an error if this `Value` is not a record
pub fn into_record(self) -> Result<Record, ShellError> {
if let Value::Record { val, .. } = self {
Ok(val.into_owned())
Ok(val)
} else {
self.cant_convert_to("record")
}
@ -1112,7 +1112,7 @@ impl Value {
match current {
Value::Record { mut val, .. } => {
// Make reverse iterate to avoid duplicate column leads to first value, actually last value is expected.
if let Some(found) = val.to_mut().iter_mut().rev().find(|x| {
if let Some(found) = val.iter_mut().rev().find(|x| {
if insensitive {
x.0.eq_ignore_case(column_name)
} else {
@ -1173,15 +1173,13 @@ impl Value {
let val_span = val.span();
match val {
Value::Record { mut val, .. } => {
if let Some(found) =
val.to_mut().iter_mut().rev().find(|x| {
if insensitive {
x.0.eq_ignore_case(column_name)
} else {
x.0 == column_name
}
})
{
if let Some(found) = val.iter_mut().rev().find(|x| {
if insensitive {
x.0.eq_ignore_case(column_name)
} else {
x.0 == column_name
}
}) {
Ok(std::mem::take(found.1))
} else if *optional {
Ok(Value::nothing(*origin_span))
@ -1287,7 +1285,7 @@ impl Value {
for val in vals.iter_mut() {
match val {
Value::Record { val: record, .. } => {
if let Some(val) = record.to_mut().get_mut(col_name) {
if let Some(val) = record.get_mut(col_name) {
val.upsert_data_at_cell_path(path, new_val.clone())?;
} else {
let new_col = if path.is_empty() {
@ -1299,7 +1297,7 @@ impl Value {
.upsert_data_at_cell_path(path, new_val.clone())?;
new_col
};
record.to_mut().push(col_name, new_col);
record.push(col_name, new_col);
}
}
Value::Error { error, .. } => return Err(*error.clone()),
@ -1314,7 +1312,7 @@ impl Value {
}
}
Value::Record { val: record, .. } => {
if let Some(val) = record.to_mut().get_mut(col_name) {
if let Some(val) = record.get_mut(col_name) {
val.upsert_data_at_cell_path(path, new_val)?;
} else {
let new_col = if path.is_empty() {
@ -1324,7 +1322,7 @@ impl Value {
new_col.upsert_data_at_cell_path(path, new_val)?;
new_col
};
record.to_mut().push(col_name, new_col);
record.push(col_name, new_col);
}
}
Value::LazyRecord { val, .. } => {
@ -1411,7 +1409,7 @@ impl Value {
let v_span = val.span();
match val {
Value::Record { val: record, .. } => {
if let Some(val) = record.to_mut().get_mut(col_name) {
if let Some(val) = record.get_mut(col_name) {
val.update_data_at_cell_path(path, new_val.clone())?;
} else {
return Err(ShellError::CantFindColumn {
@ -1433,7 +1431,7 @@ impl Value {
}
}
Value::Record { val: record, .. } => {
if let Some(val) = record.to_mut().get_mut(col_name) {
if let Some(val) = record.get_mut(col_name) {
val.update_data_at_cell_path(path, new_val)?;
} else {
return Err(ShellError::CantFindColumn {
@ -1503,7 +1501,7 @@ impl Value {
let v_span = val.span();
match val {
Value::Record { val: record, .. } => {
if record.to_mut().remove(col_name).is_none() && !optional {
if record.remove(col_name).is_none() && !optional {
return Err(ShellError::CantFindColumn {
col_name: col_name.clone(),
span: *span,
@ -1523,7 +1521,7 @@ impl Value {
Ok(())
}
Value::Record { val: record, .. } => {
if record.to_mut().remove(col_name).is_none() && !optional {
if record.remove(col_name).is_none() && !optional {
return Err(ShellError::CantFindColumn {
col_name: col_name.clone(),
span: *span,
@ -1583,7 +1581,7 @@ impl Value {
let v_span = val.span();
match val {
Value::Record { val: record, .. } => {
if let Some(val) = record.to_mut().get_mut(col_name) {
if let Some(val) = record.get_mut(col_name) {
val.remove_data_at_cell_path(path)?;
} else if !optional {
return Err(ShellError::CantFindColumn {
@ -1605,7 +1603,7 @@ impl Value {
Ok(())
}
Value::Record { val: record, .. } => {
if let Some(val) = record.to_mut().get_mut(col_name) {
if let Some(val) = record.get_mut(col_name) {
val.remove_data_at_cell_path(path)?;
} else if !optional {
return Err(ShellError::CantFindColumn {
@ -1675,7 +1673,7 @@ impl Value {
let v_span = val.span();
match val {
Value::Record { val: record, .. } => {
if let Some(val) = record.to_mut().get_mut(col_name) {
if let Some(val) = record.get_mut(col_name) {
if path.is_empty() {
return Err(ShellError::ColumnAlreadyExists {
col_name: col_name.clone(),
@ -1702,7 +1700,7 @@ impl Value {
)?;
new_col
};
record.to_mut().push(col_name, new_col);
record.push(col_name, new_col);
}
}
Value::Error { error, .. } => return Err(*error.clone()),
@ -1718,7 +1716,7 @@ impl Value {
}
}
Value::Record { val: record, .. } => {
if let Some(val) = record.to_mut().get_mut(col_name) {
if let Some(val) = record.get_mut(col_name) {
if path.is_empty() {
return Err(ShellError::ColumnAlreadyExists {
col_name: col_name.clone(),
@ -1736,7 +1734,7 @@ impl Value {
new_col.insert_data_at_cell_path(path, new_val, head_span)?;
new_col
};
record.to_mut().push(col_name, new_col);
record.push(col_name, new_col);
}
}
Value::LazyRecord { val, .. } => {
@ -1809,7 +1807,6 @@ impl Value {
// Check for contained values
match self {
Value::Record { ref mut val, .. } => val
.to_mut()
.iter_mut()
.try_for_each(|(_, rec_value)| rec_value.recurse_mut(f)),
Value::List { ref mut vals, .. } => vals
@ -1944,7 +1941,7 @@ impl Value {
pub fn record(val: Record, span: Span) -> Value {
Value::Record {
val: SharedCow::new(val),
val,
internal_span: span,
}
}
@ -2364,8 +2361,8 @@ impl PartialOrd for Value {
// reorder cols and vals to make more logically compare.
// more general, if two record have same col and values,
// the order of cols shouldn't affect the equal property.
let mut lhs = lhs.clone().into_owned();
let mut rhs = rhs.clone().into_owned();
let mut lhs = lhs.clone();
let mut rhs = rhs.clone();
lhs.sort_cols();
rhs.sort_cols();

5
crates/nu-protocol/src/value/record.rs
View File

@ -98,6 +98,7 @@ impl Record {
pub fn get_mut(&mut self, col: impl AsRef<str>) -> Option<&mut Value> {
self.inner
.make_mut()
.iter_mut()
.find_map(|(k, v)| if k == col.as_ref() { Some(v) } else { None })
}
@ -288,7 +289,7 @@ impl Record {
/// );
/// ```
pub fn sort_cols(&mut self) {
self.inner.sort_by(|(k1, _), (k2, _)| k1.cmp(k2))
self.inner.make_mut().sort_by(|(k1, _), (k2, _)| k1.cmp(k2))
}
}
@ -503,7 +504,7 @@ impl<'a> IntoIterator for &'a mut Record {
fn into_iter(self) -> Self::IntoIter {
IterMut {
iter: self.inner.iter_mut(),
iter: self.inner.make_mut().iter_mut(),
}
}
}

26
crates/nu-table/src/types/collapse.rs
View File

@ -3,8 +3,7 @@ use crate::{
StringResult, TableOpts, UnstructuredTable,
};
use nu_color_config::StyleComputer;
use nu_protocol::{Config, Record, TableMode, Value};
use nu_utils::SharedCow;
use nu_protocol::{Config, TableMode, Value};
pub struct CollapsedTable;
@ -49,20 +48,17 @@ fn colorize_value(value: &mut Value, config: &Config, style_computer: &StyleComp
// Take ownership of the record and reassign to &mut
// We do this to have owned keys through `.into_iter`
let record = std::mem::take(val);
*val = SharedCow::new(
record
.into_owned()
.into_iter()
.map(|(mut header, mut val)| {
colorize_value(&mut val, config, style_computer);
*val = record
.into_iter()
.map(|(mut header, mut val)| {
colorize_value(&mut val, config, style_computer);
if let Some(color) = style.color_style {
header = color.paint(header).to_string();
}
(header, val)
})
.collect::<Record>(),
);
if let Some(color) = style.color_style {
header = color.paint(header).to_string();
}
(header, val)
})
.collect();
}
Value::List { vals, .. } => {
for val in vals {

5
crates/nu-table/src/unstructured_table.rs
View File

@ -89,7 +89,7 @@ fn build_table(
fn convert_nu_value_to_table_value(value: Value, config: &Config) -> TableValue {
match value {
Value::Record { val, .. } => build_vertical_map(val.into_owned(), config),
Value::Record { val, .. } => build_vertical_map(val, config),
Value::List { vals, .. } => {
let rebuild_array_as_map = is_valid_record(&vals) && count_columns_in_record(&vals) > 0;
if rebuild_array_as_map {
@ -195,8 +195,7 @@ fn build_map_from_record(vals: Vec<Value>, config: &Config) -> TableValue {
for val in vals {
match val {
Value::Record { val, .. } => {
for (i, (_key, val)) in val.into_owned().into_iter().take(count_columns).enumerate()
{
for (i, (_key, val)) in val.into_iter().take(count_columns).enumerate() {
let cell = convert_nu_value_to_table_value(val, config);
list[i].push(cell);
}

8
crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/mod.rs
View File

@ -177,11 +177,9 @@ impl NuDataFrame {
conversion::insert_record(&mut column_values, record, &maybe_schema)?
}
Value::Record { val: record, .. } => conversion::insert_record(
&mut column_values,
record.into_owned(),
&maybe_schema,
)?,
Value::Record { val: record, .. } => {
conversion::insert_record(&mut column_values, record, &maybe_schema)?
}
_ => {
let key = "0".to_string();
conversion::insert_value(value, key, &mut column_values, &maybe_schema)?

2
crates/nuon/src/to.rs
View File

@ -201,7 +201,7 @@ fn value_to_string(
},
Value::Record { val, .. } => {
let mut collection = vec![];
for (col, val) in &**val {
for (col, val) in val {
collection.push(if needs_quotes(col) {
format!(
"{idt_po}\"{}\": {}",