Merge pull request #1137 from utam0k/improve/cargo-upgrade

Upgrade dependencies
2024-11-26 06:08:07 +01:00 · 2022-08-23 08:55:09 +09:00 · 2022-08-23 08:55:09 +09:00 · 74d6bf879d
commit 74d6bf879d
parent c16a1cb009 0e2ebba396
6 changed files with 88 additions and 95 deletions
--- a/.github/workflows/integration_tests_validation.yaml
+++ b/.github/workflows/integration_tests_validation.yaml
@ -26,7 +26,7 @@ jobs:
    timeout-minutes: 15
    strategy:
      matrix:
-        rust: [1.61.0, 1.62.1]
+        rust: [1.62.1, 1.63.0]
    steps:
      - uses: actions/checkout@v2
      - uses: actions-rs/toolchain@v1
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -31,7 +31,7 @@ jobs:
    timeout-minutes: 15
    strategy:
      matrix:
-        rust: [1.61.0, 1.62.1]
+        rust: [1.62.1, 1.63.0]
        dirs: ${{ fromJSON(needs.changes.outputs.dirs) }}
    steps:
      - uses: actions/checkout@v2
@ -55,7 +55,7 @@ jobs:
    timeout-minutes: 15
    strategy:
      matrix:
-        rust: [1.61.0, 1.62.1]
+        rust: [1.62.1, 1.63.0]
    steps:
      - uses: actions/checkout@v2
      - uses: actions-rs/toolchain@v1
@ -105,7 +105,7 @@ jobs:
    timeout-minutes: 15
    strategy:
      matrix:
-        rust: [1.61.0, 1.62.1]
+        rust: [1.62.1, 1.63.0]
    steps:
      - uses: actions/checkout@v2
        with:
--- a/Cargo.lock
+++ b/Cargo.lock
@ -48,9 +48,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.60"
+version = "1.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c794e162a5eff65c72ef524dfe393eb923c354e350bb78b9c7383df13f3bc142"
+checksum = "1485d4d2cc45e7b201ee3767015c96faa5904387c9d87c6efdd0fb511f12d305"

 [[package]]
 name = "ascii"
@ -137,11 +137,10 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"

 [[package]]
 name = "caps"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61bf7211aad104ce2769ec05efcdfabf85ee84ac92461d142f22cf8badd0e54c"
+checksum = "938c50180feacea622ef3b8f4a496057c868dcf8ac7a64d781dd8f3f51a9c143"
 dependencies = [
- "errno",
 "libc",
 "thiserror",
 ]
@ -479,7 +478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f"
 dependencies = [
 "cfg-if 1.0.0",
- "hashbrown 0.12.1",
+ "hashbrown 0.12.3",
 "lock_api",
 "parking_lot_core",
 ]
@ -546,9 +545,9 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"

 [[package]]
 name = "either"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be"
+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"

 [[package]]
 name = "enum-iterator"
@ -556,16 +555,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6"
 dependencies = [
- "enum-iterator-derive 0.7.0",
-]
-
-[[package]]
-name = "enum-iterator"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a0ac4aeb3a18f92eaf09c6bb9b3ac30ff61ca95514fc58cbead1c9a6bf5401"
-dependencies = [
- "enum-iterator-derive 1.0.2",
+ "enum-iterator-derive",
 ]

 [[package]]
@ -579,17 +569,6 @@ dependencies = [
 "syn",
 ]

-[[package]]
-name = "enum-iterator-derive"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b13f1e69590421890f90448c3cd5f554746a31adc6dc0dac406ec6901db8dc25"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "enumset"
 version = "1.0.11"
@ -731,9 +710,9 @@ checksum = "85dcb89d2b10c5f6133de2efd8c11959ce9dbb46a2f7a4cab208c4eeda6ce1ab"

 [[package]]
 name = "futures"
-version = "0.3.21"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
+checksum = "ab30e97ab6aacfe635fad58f22c2bb06c8b685f7421eb1e064a729e2a5f481fa"
 dependencies = [
 "futures-channel",
 "futures-core",
@ -762,9 +741,9 @@ checksum = "d2acedae88d38235936c3922476b10fced7b2b68136f5e3c03c2d5be348a1115"

 [[package]]
 name = "futures-executor"
-version = "0.3.21"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
+checksum = "1d11aa21b5b587a64682c0094c2bdd4df0076c5324961a40cc3abd7f37930528"
 dependencies = [
 "futures-core",
 "futures-task",
@ -774,15 +753,15 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.21"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
+checksum = "93a66fc6d035a26a3ae255a6d2bca35eda63ae4c5512bef54449113f7a1228e5"

 [[package]]
 name = "futures-macro"
-version = "0.3.21"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
+checksum = "0db9cce532b0eae2ccf2766ab246f114b56b9cf6d445e00c2549fbc100ca045d"
 dependencies = [
 "proc-macro2",
 "quote",
@ -797,15 +776,15 @@ checksum = "ca0bae1fe9752cf7fd9b0064c674ae63f97b37bc714d745cbde0afb7ec4e6765"

 [[package]]
 name = "futures-task"
-version = "0.3.21"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
+checksum = "842fc63b931f4056a24d59de13fb1272134ce261816e063e634ad0c15cdc5306"

 [[package]]
 name = "futures-util"
-version = "0.3.21"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
+checksum = "f0828a5471e340229c11c77ca80017937ce3c58cb788a17e5f1c2d5c485a9577"
 dependencies = [
 "futures-channel",
 "futures-core",
@ -886,9 +865,9 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
 "ahash",
 ]
@ -957,7 +936,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
 dependencies = [
 "autocfg",
- "hashbrown 0.12.1",
+ "hashbrown 0.12.3",
 "serde",
 ]

@ -982,7 +961,7 @@ dependencies = [
 "libcgroups",
 "libcontainer",
 "log",
- "nix",
+ "nix 0.24.2",
 "num_cpus",
 "oci-spec",
 "once_cell",
@ -1069,9 +1048,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.127"
+version = "0.2.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "505e71a4706fa491e9b1b55f51b95d4037d0821ee40131190475f692b35b009b"
+checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"

 [[package]]
 name = "libcgroups"
@ -1087,7 +1066,7 @@ dependencies = [
 "libc",
 "log",
 "mockall",
- "nix",
+ "nix 0.24.2",
 "oci-spec",
 "procfs",
 "quickcheck",
@ -1114,7 +1093,7 @@ dependencies = [
 "libseccomp",
 "log",
 "mio",
- "nix",
+ "nix 0.24.2",
 "oci-spec",
 "path-clean",
 "prctl",
@ -1348,6 +1327,20 @@ dependencies = [
 "memoffset",
 ]

+[[package]]
+name = "nix"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
+dependencies = [
+ "autocfg",
+ "bitflags",
+ "cfg-if 1.0.0",
+ "libc",
+ "memoffset",
+ "pin-utils",
+]
+
 [[package]]
 name = "no-std-net"
 version = "0.6.0"
@ -1444,9 +1437,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
+checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"

 [[package]]
 name = "os_str_bytes"
@ -1562,7 +1555,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "059a34f111a9dee2ce1ac2826a68b24601c4298cfeb1a587c3cb493d5ab46f52"
 dependencies = [
 "libc",
- "nix",
+ "nix 0.25.0",
 ]

 [[package]]
@ -1651,24 +1644,24 @@ dependencies = [

 [[package]]
 name = "protobuf"
-version = "2.27.1"
+version = "2.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96"
+checksum = "47c327e191621a2158159df97cdbc2e7074bb4e940275e35abf38eb3d2595754"

 [[package]]
 name = "protobuf-codegen"
-version = "2.27.1"
+version = "2.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aec1632b7c8f2e620343439a7dfd1f3c47b18906c4be58982079911482b5d707"
+checksum = "3df8c98c08bd4d6653c2dbae00bd68c1d1d82a360265a5b0bbc73d48c63cb853"
 dependencies = [
 "protobuf",
 ]

 [[package]]
 name = "protobuf-codegen-pure"
-version = "2.27.1"
+version = "2.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f8122fdb18e55190c796b088a16bdb70cd7acdcd48f7a8b796b58c62e532cc6"
+checksum = "394a73e2a819405364df8d30042c0f1174737a763e0170497ec9d36f8a2ea8f7"
 dependencies = [
 "protobuf",
 "protobuf-codegen",
@ -1854,7 +1847,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cec2b3485b07d96ddfd3134767b8a447b45ea4eb91448d0a35180ec0ffd5ed15"
 dependencies = [
 "bytecheck",
- "hashbrown 0.12.1",
+ "hashbrown 0.12.3",
 "ptr_meta",
 "rend",
 "rkyv_derive",
@ -1876,7 +1869,7 @@ dependencies = [
 name = "runtimetest"
 version = "0.0.1"
 dependencies = [
- "nix",
+ "nix 0.24.2",
 "oci-spec",
 ]

@ -1919,7 +1912,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.12",
+ "semver 1.0.13",
 ]

 [[package]]
@ -1971,9 +1964,9 @@ dependencies = [

 [[package]]
 name = "semver"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1"
+checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711"

 [[package]]
 name = "semver-parser"
@ -1983,9 +1976,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"

 [[package]]
 name = "serde"
-version = "1.0.143"
+version = "1.0.144"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553"
+checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
 dependencies = [
 "serde_derive",
 ]
@ -2001,9 +1994,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.143"
+version = "1.0.144"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391"
+checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2012,9 +2005,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7"
+checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
 dependencies = [
 "itoa",
 "ryu",
@ -2171,9 +2164,9 @@ dependencies = [

 [[package]]
 name = "syscalls"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45d0fbfaf55a79aacf6af721e0216f7bd12b8c1e88299cf6b7e030a6ed2e17f3"
+checksum = "9148c90637a79c6b331f80914a78816358bff6ca69c8af8f6fbbda9869bb2a39"
 dependencies = [
 "cc",
 "serde",
@ -2182,9 +2175,9 @@ dependencies = [

 [[package]]
 name = "sysinfo"
-version = "0.25.2"
+version = "0.23.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1594a36887d0f70096702bffadfb67dfbfe76ad4bf84605e86157dc9fce9961a"
+checksum = "3977ec2e0520829be45c8a2df70db2bf364714d8a748316a10c3c35d4d2b01c9"
 dependencies = [
 "cfg-if 1.0.0",
 "core-foundation-sys",
@ -2444,13 +2437,13 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"

 [[package]]
 name = "vergen"
-version = "7.4.0"
+version = "7.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ffa80ed519f45995741e70664d4abcf147d2a47b8c7ea0a4aa495548ef9474f"
+checksum = "b1f44ef1afcf5979e34748c12595f9589f3dc4e34abf156fb6d95f9b835568dc"
 dependencies = [
 "anyhow",
 "cfg-if 1.0.0",
- "enum-iterator 1.1.3",
+ "enum-iterator",
 "getset",
 "git2",
 "rustc_version 0.4.0",
@ -2534,9 +2527,9 @@ checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"

 [[package]]
 name = "wasm-encoder"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8905fd25fdadeb0e7e8bf43a9f46f9f972d6291ad0c7a32573b88dd13a6cfa6b"
+checksum = "d443c5a7daae71697d97ec12ad70b4fe8766d3a0f4db16158ac8b781365892f7"
 dependencies = [
 "leb128",
 ]
@ -2661,7 +2654,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad0358af9c154724587731175553805648d9acb8f6657880d165e378672b7e53"
 dependencies = [
 "cfg-if 1.0.0",
- "enum-iterator 0.7.0",
+ "enum-iterator",
 "enumset",
 "leb128",
 "libloading",
@ -2706,7 +2699,7 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68f1db3f54152657eb6e86c44b66525ff7801dad8328fe677da48dd06af9ad41"
 dependencies = [
- "enum-iterator 0.7.0",
+ "enum-iterator",
 "enumset",
 "loupe",
 "rkyv",
@ -2735,7 +2728,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39df01ea05dc0a9bab67e054c7cb01521e53b35a7bb90bd02eca564ed0b2667f"
 dependencies = [
 "backtrace",
- "enum-iterator 0.7.0",
+ "enum-iterator",
 "indexmap",
 "loupe",
 "more-asserts",
@ -2765,7 +2758,7 @@ dependencies = [
 "cc",
 "cfg-if 1.0.0",
 "corosensei",
- "enum-iterator 0.7.0",
+ "enum-iterator",
 "indexmap",
 "lazy_static",
 "libc",
@ -2821,9 +2814,9 @@ checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a"

 [[package]]
 name = "wast"
-version = "45.0.0"
+version = "46.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186c474c4f9bb92756b566d592a16591b4526b1a4841171caa3f31d7fe330d96"
+checksum = "ea0ab19660e3ea6891bba69167b9be40fad00fb1fe3dd39c5eebcee15607131b"
 dependencies = [
 "leb128",
 "memchr",
@ -2833,9 +2826,9 @@ dependencies = [

 [[package]]
 name = "wat"
-version = "1.0.47"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2d4bc4724b4f02a482c8cab053dac5ef26410f264c06ce914958f9a42813556"
+checksum = "8f775282def4d5bffd94d60d6ecd57bfe6faa46171cdbf8d32bd5458842b1e3e"
 dependencies = [
 "wast",
 ]
@ -2989,7 +2982,7 @@ dependencies = [
 "libcontainer",
 "liboci-cli",
 "log",
- "nix",
+ "nix 0.24.2",
 "oci-spec",
 "once_cell",
 "pentacle",
--- a/crates/libcontainer/src/config.rs
+++ b/crates/libcontainer/src/config.rs
@ -14,7 +14,7 @@ const YOUKI_CONFIG_NAME: &str = "youki_config.json";

 /// A configuration for passing information obtained during container creation to other commands.
 /// Keeping the information to a minimum improves performance.
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
 #[non_exhaustive]
 pub struct YoukiConfig {
    pub hooks: Option<Hooks>,
--- a/crates/youki/Cargo.toml
+++ b/crates/youki/Cargo.toml
@ -38,4 +38,4 @@ serial_test = "0.9.0"

 [build-dependencies]
 anyhow = "1.0.60"
-vergen = "7.4"
+vergen = "7.2.1"
--- a/tests/rust-integration-tests/integration_test/src/tests/lifecycle/container_create.rs
+++ b/tests/rust-integration-tests/integration_test/src/tests/lifecycle/container_create.rs
@ -8,13 +8,13 @@ pub struct ContainerCreate {
    container_id: String,
 }

-impl<'a> Default for ContainerCreate {
+impl Default for ContainerCreate {
    fn default() -> Self {
        Self::new()
    }
 }

-impl<'a> ContainerCreate {
+impl ContainerCreate {
    pub fn new() -> Self {
        let id = generate_uuid();
        let temp_dir = prepare_bundle(&id).unwrap();