From 7c5dcbb3fc221788b5f4bb8dc874e2acc8c3da1a Mon Sep 17 00:00:00 2001 From: Jack Wright <56345+ayax79@users.noreply.github.com> Date: Thu, 17 Oct 2024 10:01:08 -0700 Subject: [PATCH] Update to rust 1.80.1 (#14106) This can be merged on 10/17 once 1.82.0 is out. --------- Co-authored-by: Wind --- Cargo.toml | 4 ++-- crates/nu-plugin/src/plugin/interface/mod.rs | 3 +-- rust-toolchain.toml | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 82bbf99d37..b45160c9a5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ homepage = "https://www.nushell.sh" license = "MIT" name = "nu" repository = "https://github.com/nushell/nushell" -rust-version = "1.79.0" +rust-version = "1.80.1" version = "0.99.2" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -320,4 +320,4 @@ bench = false # Run individual benchmarks like `cargo bench -- ` e.g. `cargo bench -- parse` [[bench]] name = "benchmarks" -harness = false \ No newline at end of file +harness = false diff --git a/crates/nu-plugin/src/plugin/interface/mod.rs b/crates/nu-plugin/src/plugin/interface/mod.rs index fc40b9c732..be7b2e0dfc 100644 --- a/crates/nu-plugin/src/plugin/interface/mod.rs +++ b/crates/nu-plugin/src/plugin/interface/mod.rs @@ -1091,8 +1091,7 @@ fn set_pgrp_from_enter_foreground(pgrp: i64) -> Result<(), ShellError> { fn set_pgrp_from_enter_foreground(_pgrp: i64) -> Result<(), ShellError> { Err(ShellError::NushellFailed { msg: concat!( - "EnterForeground asked plugin to join process group, but not supported on ", - cfg!(target_os) + "EnterForeground asked plugin to join process group, but this is not supported on non UNIX platforms.", ) .into(), }) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index bb2f1fcb35..183da649b8 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.79.0" +channel = "1.80.1"