diff --git a/Cargo.lock b/Cargo.lock index 7233022d6..02e5f20af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1090,6 +1090,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -1132,11 +1141,23 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset", + "memoffset 0.7.1", "pin-utils", "static_assertions", ] +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.3.3", + "cfg-if", + "libc", + "memoffset 0.9.0", +] + [[package]] name = "nom" version = "7.1.3" @@ -1340,12 +1361,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prettyplease" -version = "0.1.25" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] @@ -1372,9 +1393,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.9" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "aa8473a65b88506c106c28ae905ca4a2b83a2993640467a41bb3080627ddfd2c" dependencies = [ "bytes", "prost-derive", @@ -1382,44 +1403,44 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.9" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +checksum = "30d3e647e9eb04ddfef78dfee2d5b3fefdf94821c84b710a3d8ebc89ede8b164" dependencies = [ "bytes", "heck", "itertools", - "lazy_static", "log 0.4.19", "multimap", + "once_cell", "petgraph", "prettyplease", "prost", "prost-types", "regex", - "syn 1.0.109", + "syn 2.0.28", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.11.9" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "56075c27b20ae524d00f247b8a4dc333e5784f889fe63099f8e626bc8d73486c" dependencies = [ "anyhow", "itertools", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] name = "prost-types" -version = "0.11.9" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "cebe0a918c97f86c217b0f76fd754e966f8b9f41595095cf7d74cb4e59d730f6" dependencies = [ "prost", ] @@ -1850,7 +1871,7 @@ dependencies = [ "libc", "log 0.4.19", "mio", - "nix", + "nix 0.26.2", "nom", "num_cpus", "paw", @@ -1878,7 +1899,7 @@ dependencies = [ "log 0.4.19", "memchr", "mio", - "nix", + "nix 0.27.1", "nom", "pool", "poule", diff --git a/bin/Cargo.toml b/bin/Cargo.toml index d386ed66f..a74383c8f 100644 --- a/bin/Cargo.toml +++ b/bin/Cargo.toml @@ -15,7 +15,7 @@ authors = [ ] categories = ["network-programming"] edition="2021" -rust-version = "1.67.0" +rust-version = "1.70.0" include = [ "README.md", "Cargo.toml", diff --git a/bin/rust-toolchain b/bin/rust-toolchain deleted file mode 100644 index 65ee09598..000000000 --- a/bin/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.67.0 diff --git a/command/Cargo.toml b/command/Cargo.toml index 37eba75e6..4b87d4bcf 100644 --- a/command/Cargo.toml +++ b/command/Cargo.toml @@ -15,7 +15,7 @@ authors = [ ] categories = ["network-programming"] edition = "2021" -rust-version = "1.67.0" +rust-version = "1.70.0" include = [ "./README.md", "Cargo.toml", @@ -34,9 +34,9 @@ time = "^0.3.25" toml = "^0.7.6" memchr = "^2.5.0" mio = { version = "^0.8.8", features = ["os-poll", "net"] } -nix = "^0.26.2" +nix = { version = "^0.27.1", features = ["socket", "uio"] } nom = "^7.1.3" -prost = "^0.11.9" +prost = "^0.12.0" rand = "^0.8.5" serde = { version = "^1.0.183", features = ["derive"] } serde_json = "^1.0.104" @@ -56,4 +56,4 @@ logs-trace = [] travis-ci = { repository = "sozu-proxy/sozu" } [build-dependencies] -prost-build = { version = "^0.11.9" } +prost-build = { version = "^0.12.0" } \ No newline at end of file diff --git a/command/rust-toolchain b/command/rust-toolchain deleted file mode 100644 index 77c582d8d..000000000 --- a/command/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.67.0 \ No newline at end of file diff --git a/e2e/Cargo.toml b/e2e/Cargo.toml index b9c057fd4..4b39cea71 100644 --- a/e2e/Cargo.toml +++ b/e2e/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "sozu-e2e" version = "0.15.3" -rust-version = "1.67.0" +rust-version = "1.70.0" edition = "2021" [dependencies] diff --git a/e2e/rust-toolchain b/e2e/rust-toolchain deleted file mode 100644 index 65ee09598..000000000 --- a/e2e/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.67.0 diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 89a67ce72..382041b56 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -16,7 +16,7 @@ authors = [ ] categories = ["network-programming"] edition = "2021" -rust-version = "1.67.0" +rust-version = "1.70.0" include = [ "./README.md", "Cargo.toml", diff --git a/lib/rust-toolchain b/lib/rust-toolchain deleted file mode 100644 index 77c582d8d..000000000 --- a/lib/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.67.0 \ No newline at end of file diff --git a/rust-toolchain b/rust-toolchain new file mode 100644 index 000000000..9006c0b46 --- /dev/null +++ b/rust-toolchain @@ -0,0 +1 @@ +1.70.0 \ No newline at end of file