From 21b62da57f590a4e1d335e15c2d8f24aa277db7d Mon Sep 17 00:00:00 2001 From: Toru Komatsu Date: Fri, 8 Dec 2023 22:26:19 +0900 Subject: [PATCH] Rust 1.74.1 (#2557) Signed-off-by: utam0k --- crates/libcgroups/src/v1/blkio.rs | 2 +- crates/libcontainer/src/signal.rs | 5 ++--- rust-toolchain.toml | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/crates/libcgroups/src/v1/blkio.rs b/crates/libcgroups/src/v1/blkio.rs index a66102a40..76e90f5c4 100644 --- a/crates/libcgroups/src/v1/blkio.rs +++ b/crates/libcgroups/src/v1/blkio.rs @@ -64,7 +64,7 @@ const BLKIO_IO_SERVICE_BYTES: &str = "blkio.io_service_bytes_recursive"; // Format: Major:Minor Type Ops const BLKIO_IO_SERVICED: &str = "blkio.io_serviced_recursive"; // Total time between request dispatch and request completion -//// Format: Major:Minor Type Time(ns) +/// Format: Major:Minor Type Time(ns) const BLKIO_IO_SERVICE_TIME: &str = "blkio.io_service_time_recursive"; // Total time spend waiting in the scheduler queues for service // Format: Major:Minor Type Time(ns) diff --git a/crates/libcontainer/src/signal.rs b/crates/libcontainer/src/signal.rs index 547098600..2f4ec4958 100644 --- a/crates/libcontainer/src/signal.rs +++ b/crates/libcontainer/src/signal.rs @@ -19,7 +19,7 @@ impl TryFrom<&str> for Signal { fn try_from(s: &str) -> Result { use NixSignal::*; - Ok(match s.to_ascii_uppercase().as_str() { + Ok(Signal(match s.to_ascii_uppercase().as_str() { "1" | "HUP" | "SIGHUP" => SIGHUP, "2" | "INT" | "SIGINT" => SIGINT, "3" | "QUIT" | "SIGQUIT" => SIGQUIT, @@ -52,8 +52,7 @@ impl TryFrom<&str> for Signal { "30" | "PWR" | "SIGPWR" => SIGPWR, "31" | "SYS" | "SIGSYS" => SIGSYS, _ => return Err(SignalError::InvalidSignal(s.to_string())), - }) - .map(Signal) + })) } } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 3d0dec0c8..4fc47f6e0 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] profile="default" -channel="1.72.0" +channel="1.74.1"