From 8af7ed95d3ee06a24c864c9c5427fb870e367347 Mon Sep 17 00:00:00 2001 From: ardocrat Date: Wed, 8 Nov 2023 22:30:02 +0300 Subject: [PATCH] build: update dependencies --- Cargo.lock | 67 ++++++++++++++++++++++++---------------------- Cargo.toml | 4 +-- src/build/build.rs | 14 +--------- 3 files changed, 38 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0872512..6b629e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -736,11 +736,10 @@ dependencies = [ [[package]] name = "built" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99c4cdc7b2c2364182331055623bdf45254fcb679fea565c40c3c11c101889a" +checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" dependencies = [ - "cargo-lock", "git2", ] @@ -818,18 +817,6 @@ dependencies = [ "vec_map", ] -[[package]] -name = "cargo-lock" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" -dependencies = [ - "semver", - "serde", - "toml 0.7.6", - "url", -] - [[package]] name = "cc" version = "1.0.82" @@ -2131,11 +2118,11 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "git2" -version = "0.17.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" +checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "libc", "libgit2-sys", "log", @@ -2352,7 +2339,7 @@ dependencies = [ "sys-locale", "tokio 1.31.0", "tokio-util 0.7.8", - "toml 0.7.6", + "toml 0.8.2", "url", "winit", ] @@ -3388,9 +3375,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libgit2-sys" -version = "0.15.2+1.6.4" +version = "0.16.1+1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" +checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" dependencies = [ "cc", "libc", @@ -4530,7 +4517,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.14", ] [[package]] @@ -5330,15 +5317,6 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" -[[package]] -name = "semver" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" -dependencies = [ - "serde", -] - [[package]] name = "serde" version = "1.0.183" @@ -6100,7 +6078,19 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.14", +] + +[[package]] +name = "toml" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] @@ -6125,6 +6115,19 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower-service" version = "0.3.2" diff --git a/Cargo.toml b/Cargo.toml index ce6e9bd..b7fb0f8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,7 @@ dirs = "5.0.1" sys-locale = "0.3.0" chrono = "0.4.23" lazy_static = "1.4.0" -toml = "0.7.4" +toml = "0.8.2" serde = "1.0.170" pnet = "0.34.0" url = "2.4.0" @@ -56,7 +56,7 @@ tokio-util = { version = "0.7.8", features = ["codec"] } rand = "0.8.5" [build-dependencies] -built = { version = "0.6.0", features = ["git2"]} +built = { version = "0.7.0", features = ["git2"]} [target.'cfg(not(target_os = "android"))'.dependencies] env_logger = "0.10.0" diff --git a/src/build/build.rs b/src/build/build.rs index d3fba34..9def9a5 100644 --- a/src/build/build.rs +++ b/src/build/build.rs @@ -12,18 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -use std::env; -use std::path::Path; - fn main() { - // build and versioning information - let mut opts = built::Options::default(); - opts.set_dependencies(true); - let out_dir_path = format!("{}{}", env::var("OUT_DIR").unwrap(), "/built.rs"); - // don't fail the build if something's missing, may just be cargo release - let _ = built::write_built_file_with_opts( - &opts, - Path::new(env!("CARGO_MANIFEST_DIR")), - Path::new(&out_dir_path), - ); + built::write_built_file().expect("Failed to acquire build-time information");; }