mirror/youki
1
0
Fork 0
mirror of https://github.com/containers/youki synced 2024-11-22 17:02:00 +01:00
Code Issues

Rust 1.74.1 (#2557)

Browse Source 
Signed-off-by: utam0k <k0ma@utam0k.jp>
This commit is contained in:
Toru Komatsu 2023-12-08 22:26:19 +09:00 committed by GitHub
parent 36bc63f4f2
commit 21b62da57f
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/libcgroups/src/v1/blkio.rs
View File

@ -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)

5
crates/libcontainer/src/signal.rs
View File

@ -19,7 +19,7 @@ impl TryFrom<&str> for Signal {
fn try_from(s: &str) -> Result<Self, Self::Error> {
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)
}))
}
}

2
rust-toolchain.toml
View File

@ -1,3 +1,3 @@
[toolchain]
profile="default"
channel="1.72.0"
channel="1.74.1"