From 36909e2dfc05d6eb151cff11fb289b179af0b803 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Mon, 31 Oct 2022 14:43:25 +0100 Subject: [PATCH 1/4] Run `cargo update` --- Cargo.lock | 55 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 806df384b..829f8191e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -308,7 +308,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.5.4", "object", "rustc-demangle", ] @@ -443,9 +443,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574" [[package]] name = "cfg-if" @@ -514,9 +514,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.48" +version = "0.1.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" dependencies = [ "cc", ] @@ -1274,7 +1274,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.5.4", ] [[package]] @@ -1685,9 +1685,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "41a2df176f359a22aee9c8657e674f7aa54e9ba48b512a798e5ca36a1f51065c" dependencies = [ "bytes", "futures-channel", @@ -1738,9 +1738,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.51" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1917,9 +1917,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.136" +version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55edcf6c0bb319052dea84732cf99db461780fd5e8d3eb46ab6ff312ab31f197" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "libloading" @@ -2069,6 +2069,15 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + [[package]] name = "mio" version = "0.8.5" @@ -2449,9 +2458,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "openssl" @@ -2535,9 +2544,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.3.0" +version = "6.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9" [[package]] name = "output_vt100" @@ -2692,20 +2701,20 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "png" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c" +checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" dependencies = [ "bitflags", "crc32fast", "flate2", - "miniz_oxide", + "miniz_oxide 0.6.2", ] [[package]] @@ -3326,9 +3335,9 @@ dependencies = [ [[package]] name = "simba" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48e45e5961033db030b56ad67aef22e9c908c493a6e8348c0a0f6b93433cd77" +checksum = "2f3fd720c48c53cace224ae62bef1bbff363a70c68c4802a78b5cc6159618176" dependencies = [ "approx 0.5.1", "num-complex", From 1a9cca043296d72a21de2651047769a280285124 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Mon, 31 Oct 2022 14:51:48 +0100 Subject: [PATCH 2/4] Remove unused dependency --- Cargo.lock | 1 - crates/fj-kernel/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 829f8191e..0d79be701 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1189,7 +1189,6 @@ dependencies = [ "fj-interop", "fj-math", "parking_lot", - "parry2d-f64", "pretty_assertions", "robust-predicates", "spade", diff --git a/crates/fj-kernel/Cargo.toml b/crates/fj-kernel/Cargo.toml index 2394f7ab8..6fab7f3ff 100644 --- a/crates/fj-kernel/Cargo.toml +++ b/crates/fj-kernel/Cargo.toml @@ -14,7 +14,6 @@ categories.workspace = true fj-interop.workspace = true fj-math.workspace = true parking_lot = "0.12.0" -parry2d-f64 = "0.10.0" pretty_assertions = "1.3.0" robust-predicates = "0.1.4" spade = "2.0.0" From 49a6bab0b626eaa6f09b33fa3f3fac3b4767c734 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Mon, 31 Oct 2022 14:53:42 +0100 Subject: [PATCH 3/4] Upgrade to latest version of Parry --- Cargo.lock | 8 ++++---- crates/fj-math/Cargo.toml | 4 ++-- crates/fj-math/src/aabb.rs | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0d79be701..edd0f71fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2602,9 +2602,9 @@ dependencies = [ [[package]] name = "parry2d-f64" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd4dc7afa86539ec96326bd6560e8051d823c8107b7227d1cd4fcf26024197a" +checksum = "613736fb92039b8fe0a8a02a3b40344efbbfcb15b7d7086f82962d64389995a7" dependencies = [ "approx 0.5.1", "arrayvec 0.7.2", @@ -2623,9 +2623,9 @@ dependencies = [ [[package]] name = "parry3d-f64" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36afd258d7ec516d15854c80b933277258028378b4f059446ed304b3ba42267" +checksum = "3f42d28bb1263d1162e3105848230b258cc13b3084a45df0c77c3f75ea1c5306" dependencies = [ "approx 0.5.1", "arrayvec 0.7.2", diff --git a/crates/fj-math/Cargo.toml b/crates/fj-math/Cargo.toml index 1e3c50332..e31c58dcd 100644 --- a/crates/fj-math/Cargo.toml +++ b/crates/fj-math/Cargo.toml @@ -15,6 +15,6 @@ approx = "0.5.1" decorum = "0.3.1" nalgebra = "0.31.3" num-traits = "0.2.15" -parry2d-f64 = "0.10.0" -parry3d-f64 = "0.10.0" +parry2d-f64 = "0.11.1" +parry3d-f64 = "0.11.1" robust-predicates = "0.1.4" diff --git a/crates/fj-math/src/aabb.rs b/crates/fj-math/src/aabb.rs index 29105f6f6..001cc9a6e 100644 --- a/crates/fj-math/src/aabb.rs +++ b/crates/fj-math/src/aabb.rs @@ -57,11 +57,11 @@ impl Aabb<2> { .into_iter() .map(|point| point.into().to_na()) .collect(); - parry2d_f64::bounding_volume::AABB::from_points(&points).into() + parry2d_f64::bounding_volume::Aabb::from_points(&points).into() } /// Construct a 2-dimensional AABB from a Parry AABB - pub fn from_parry(aabb: parry2d_f64::bounding_volume::AABB) -> Self { + pub fn from_parry(aabb: parry2d_f64::bounding_volume::Aabb) -> Self { Self { min: aabb.mins.into(), max: aabb.maxs.into(), @@ -80,11 +80,11 @@ impl Aabb<3> { .into_iter() .map(|point| point.into().to_na()) .collect(); - parry3d_f64::bounding_volume::AABB::from_points(&points).into() + parry3d_f64::bounding_volume::Aabb::from_points(&points).into() } /// Construct a 3-dimensional AABB from a Parry AABB - pub fn from_parry(aabb: parry3d_f64::bounding_volume::AABB) -> Self { + pub fn from_parry(aabb: parry3d_f64::bounding_volume::Aabb) -> Self { Self { min: aabb.mins.into(), max: aabb.maxs.into(), @@ -92,8 +92,8 @@ impl Aabb<3> { } /// Convert the AABB to a Parry AABB - pub fn to_parry(self) -> parry3d_f64::bounding_volume::AABB { - parry3d_f64::bounding_volume::AABB { + pub fn to_parry(self) -> parry3d_f64::bounding_volume::Aabb { + parry3d_f64::bounding_volume::Aabb { mins: self.min.to_na(), maxs: self.max.to_na(), } @@ -128,14 +128,14 @@ impl Aabb<3> { } } -impl From for Aabb<2> { - fn from(aabb: parry2d_f64::bounding_volume::AABB) -> Self { +impl From for Aabb<2> { + fn from(aabb: parry2d_f64::bounding_volume::Aabb) -> Self { Self::from_parry(aabb) } } -impl From for Aabb<3> { - fn from(aabb: parry3d_f64::bounding_volume::AABB) -> Self { +impl From for Aabb<3> { + fn from(aabb: parry3d_f64::bounding_volume::Aabb) -> Self { Self::from_parry(aabb) } } From 0f8ef5f777c54b5c24554830261c640840a3f89f Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Mon, 31 Oct 2022 14:58:32 +0100 Subject: [PATCH 4/4] Remove unused dependency --- Cargo.lock | 1 - crates/fj-host/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index edd0f71fa..83b7443ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1167,7 +1167,6 @@ dependencies = [ "cargo_metadata", "crossbeam-channel", "fj", - "fj-interop", "libloading", "notify", "thiserror", diff --git a/crates/fj-host/Cargo.toml b/crates/fj-host/Cargo.toml index 8cd36049e..cda1c5260 100644 --- a/crates/fj-host/Cargo.toml +++ b/crates/fj-host/Cargo.toml @@ -15,7 +15,6 @@ categories.workspace = true cargo_metadata = "0.15.0" crossbeam-channel = "0.5.6" fj.workspace = true -fj-interop.workspace = true libloading = "0.7.2" notify = "5.0.0" thiserror = "1.0.35"