diff --git a/Cargo.lock b/Cargo.lock index a237ae236ae7..93a21312fff1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -485,9 +485,9 @@ dependencies = [ [[package]] name = "cbindgen" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb" +checksum = "eadd868a2ce9ca38de7eeafdcec9c7065ef89b42b32f0839278d55f35c54d1ff" dependencies = [ "heck 0.4.1", "indexmap 2.2.6", @@ -2478,7 +2478,7 @@ name = "mullvad-api" version = "0.0.0" dependencies = [ "async-trait", - "cbindgen 0.24.5", + "cbindgen 0.28.0", "chrono", "futures", "http 1.1.0", @@ -2616,7 +2616,7 @@ dependencies = [ name = "mullvad-ios" version = "0.0.0" dependencies = [ - "cbindgen 0.27.0", + "cbindgen 0.28.0", "hyper-util", "libc", "log", diff --git a/mullvad-api/Cargo.toml b/mullvad-api/Cargo.toml index 005d1a950507..db248daf630f 100644 --- a/mullvad-api/Cargo.toml +++ b/mullvad-api/Cargo.toml @@ -22,15 +22,27 @@ thiserror = { workspace = true } futures = { workspace = true } http = "1.1.0" hyper = { version = "1.4.1", features = ["client", "http1"] } -hyper-util = { workspace = true} +hyper-util = { workspace = true } http-body-util = "0.1.2" tower = { workspace = true } ipnetwork = { workspace = true } log = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -tokio = { workspace = true, features = ["macros", "time", "rt-multi-thread", "net", "io-std", "io-util", "fs"] } -tokio-rustls = { version = "0.26.0", features = ["logging", "tls12", "ring"], default-features = false} +tokio = { workspace = true, features = [ + "macros", + "time", + "rt-multi-thread", + "net", + "io-std", + "io-util", + "fs", +] } +tokio-rustls = { version = "0.26.0", features = [ + "logging", + "tls12", + "ring", +], default-features = false } tokio-socks = "0.5.1" rustls-pemfile = "2.1.3" uuid = { version = "1.4.1", features = ["v4"] } @@ -41,7 +53,7 @@ mullvad-types = { path = "../mullvad-types" } talpid-types = { path = "../talpid-types" } talpid-time = { path = "../talpid-time" } -shadowsocks = { workspace = true, features = [ "stream-cipher" ] } +shadowsocks = { workspace = true, features = ["stream-cipher"] } [dev-dependencies] talpid-time = { path = "../talpid-time", features = ["test"] } @@ -49,8 +61,8 @@ tokio = { workspace = true, features = ["test-util", "time"] } mockito = "1.6.1" [build-dependencies] -cbindgen = { version = "0.24.3", default-features = false } +cbindgen = { version = "0.28.0", default-features = false } [lib] -crate-type = [ "rlib", "staticlib" ] +crate-type = ["rlib", "staticlib"] bench = false diff --git a/mullvad-ios/Cargo.toml b/mullvad-ios/Cargo.toml index 91c2e99b6bc3..ab4a7a30502c 100644 --- a/mullvad-ios/Cargo.toml +++ b/mullvad-ios/Cargo.toml @@ -31,7 +31,7 @@ shadowsocks-service = { workspace = true, features = [ ] } [target.'cfg(target_os = "macos")'.build-dependencies] -cbindgen = { version = "0.27.0", default-features = false } +cbindgen = { version = "0.28.0", default-features = false } [lib] crate-type = ["staticlib"] diff --git a/test/Cargo.lock b/test/Cargo.lock index ded34ced7f76..c639022fa87a 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -362,18 +362,18 @@ dependencies = [ [[package]] name = "cbindgen" -version = "0.24.5" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b922faaf31122819ec80c4047cc684c6979a087366c069611e33649bf98e18d" +checksum = "eadd868a2ce9ca38de7eeafdcec9c7065ef89b42b32f0839278d55f35c54d1ff" dependencies = [ "heck 0.4.1", - "indexmap 1.9.3", + "indexmap 2.2.6", "log", "proc-macro2", "quote", "serde", "serde_json", - "syn 1.0.109", + "syn 2.0.89", "tempfile", "toml", ] @@ -3157,6 +3157,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -3901,13 +3910,38 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tonic" version = "0.12.3" @@ -4641,6 +4675,15 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "winnow" +version = "0.6.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e90edd2ac1aa278a5c4599b1d89cf03074b610800f866d4026dc199d7929a28" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.50.0"