From 89edba0f85ef85d47a334a3183aac870c93d8c94 Mon Sep 17 00:00:00 2001 From: Xuewei Niu Date: Mon, 31 Jul 2023 14:58:21 +0800 Subject: [PATCH] gha: Bump Rust version to 1.69.0 Keep Rust version the same as kata-containers repo 's version. Signed-off-by: Xuewei Niu --- .github/workflows/bvt.yaml | 2 +- .gitignore | 4 ---- src/devices.rs | 1 + src/lib.rs | 1 + tests/cgroup.rs | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bvt.yaml b/.github/workflows/bvt.yaml index be20c97..f04c5c5 100644 --- a/.github/workflows/bvt.yaml +++ b/.github/workflows/bvt.yaml @@ -1,7 +1,7 @@ name: BVT on: [pull_request] env: - RUST_VERSION: 1.52 + RUST_VERSION: 1.69.0 jobs: build: name: Build diff --git a/.gitignore b/.gitignore index 979d87e..088ba6b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,3 @@ Cargo.lock # These are backup files generated by rustfmt **/*.rs.bk - -/target -**/*.rs.bk -Cargo.lock diff --git a/src/devices.rs b/src/devices.rs index fffa879..d5325c1 100644 --- a/src/devices.rs +++ b/src/devices.rs @@ -46,6 +46,7 @@ pub enum DeviceType { Block, } +#[allow(clippy::derivable_impls)] impl Default for DeviceType { fn default() -> Self { DeviceType::All diff --git a/src/lib.rs b/src/lib.rs index 3d50982..5754a47 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -879,6 +879,7 @@ pub enum MaxValue { Value(i64), } +#[allow(clippy::derivable_impls)] impl Default for MaxValue { fn default() -> Self { MaxValue::Max diff --git a/tests/cgroup.rs b/tests/cgroup.rs index 3c9bd7d..c63be25 100644 --- a/tests/cgroup.rs +++ b/tests/cgroup.rs @@ -199,7 +199,7 @@ fn test_kill_cgroup() { } } }; - assert!(!status.is_none()); + assert!(status.is_some()); } cg.delete().unwrap(); }