From ba1b67c072005bfa1ff8cd52de9123745307f8b2 Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Wed, 5 Feb 2020 19:28:49 -0800 Subject: [PATCH] Attempt `rustup update` on each PR (#1345) * Attempt update on each PR * Update fmt --- .azure/azure-pipelines.yml | 2 +- crates/nu_plugin_inc/src/nu/mod.rs | 4 +++- src/commands/edit.rs | 4 +++- src/commands/insert.rs | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml index 469dc20fc0..6083f6c78d 100644 --- a/.azure/azure-pipelines.yml +++ b/.azure/azure-pipelines.yml @@ -38,8 +38,8 @@ steps: if [ "$(uname)" == "Darwin" ]; then curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain "stable" export PATH=$HOME/.cargo/bin:$PATH - rustup update fi + rustup update rustc -Vv echo "##vso[task.prependpath]$HOME/.cargo/bin" rustup component add rustfmt diff --git a/crates/nu_plugin_inc/src/nu/mod.rs b/crates/nu_plugin_inc/src/nu/mod.rs index b1c3811c7d..64622374b6 100644 --- a/crates/nu_plugin_inc/src/nu/mod.rs +++ b/crates/nu_plugin_inc/src/nu/mod.rs @@ -37,7 +37,9 @@ impl Plugin for Inc { if let Some(args) = call_info.args.positional { for arg in args { match arg { - table @ Value { + table + @ + Value { value: UntaggedValue::Primitive(Primitive::ColumnPath(_)), .. } => { diff --git a/src/commands/edit.rs b/src/commands/edit.rs index 7d4afd0562..82504ed2e0 100644 --- a/src/commands/edit.rs +++ b/src/commands/edit.rs @@ -42,7 +42,9 @@ impl PerItemCommand for Edit { let replacement = call_info.args.expect_nth(1)?.tagged_unknown(); let stream = match value { - obj @ Value { + obj + @ + Value { value: UntaggedValue::Row(_), .. } => match obj.replace_data_at_column_path(&field, replacement.item.clone()) { diff --git a/src/commands/insert.rs b/src/commands/insert.rs index bb9dc2b44e..d0d7452141 100644 --- a/src/commands/insert.rs +++ b/src/commands/insert.rs @@ -42,7 +42,9 @@ impl PerItemCommand for Insert { let replacement = call_info.args.expect_nth(1)?.tagged_unknown(); let stream = match value { - obj @ Value { + obj + @ + Value { value: UntaggedValue::Row(_), .. } => match obj.insert_data_at_column_path(&field, replacement.item.clone()) {