From e44442bf2aa1eea3e6164072a9bc27118900d491 Mon Sep 17 00:00:00 2001 From: Darren Schroeder <343840+fdncred@users.noreply.github.com> Date: Thu, 25 Jul 2024 14:59:02 -0500 Subject: [PATCH] bump rust-toolchain to 1.78 --- crates/nu-engine/src/eval.rs | 2 +- crates/nu-protocol/src/engine/argument.rs | 2 +- crates/nu-protocol/src/engine/error_handler.rs | 2 +- rust-toolchain.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs index 84fa700934..680e689849 100644 --- a/crates/nu-engine/src/eval.rs +++ b/crates/nu-engine/src/eval.rs @@ -198,7 +198,7 @@ pub fn redirect_env(engine_state: &EngineState, caller_stack: &mut Stack, callee } // set config to callee config, to capture any updates to that - caller_stack.config = callee_stack.config.clone(); + caller_stack.config.clone_from(&callee_stack.config) } fn eval_external( diff --git a/crates/nu-protocol/src/engine/argument.rs b/crates/nu-protocol/src/engine/argument.rs index 043654b761..178e5fd22d 100644 --- a/crates/nu-protocol/src/engine/argument.rs +++ b/crates/nu-protocol/src/engine/argument.rs @@ -71,7 +71,7 @@ impl Argument { } /// Stores the argument context for calls in IR evaluation. -#[derive(Debug, Clone)] +#[derive(Debug, Clone, Default)] pub struct ArgumentStack { arguments: Vec, } diff --git a/crates/nu-protocol/src/engine/error_handler.rs b/crates/nu-protocol/src/engine/error_handler.rs index 076678be20..0fb82c7d69 100644 --- a/crates/nu-protocol/src/engine/error_handler.rs +++ b/crates/nu-protocol/src/engine/error_handler.rs @@ -10,7 +10,7 @@ pub struct ErrorHandler { } /// Keeps track of error handlers pushed during evaluation of an IR block. -#[derive(Debug, Clone)] +#[derive(Debug, Clone, Default)] pub struct ErrorHandlerStack { handlers: Vec, } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 0682514ccf..b8ca48435b 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -16,4 +16,4 @@ profile = "default" # use in nushell, we may opt to use the bleeding edge stable version of rust. # I believe rust is on a 6 week release cycle and nushell is on a 4 week release cycle. # So, every two nushell releases, this version number should be bumped by one. -channel = "1.77.2" +channel = "1.78.0"