From 2f7336977e3a8d6dfa306e4f7182e98af3c1b56e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Thu, 13 Jan 2022 22:06:45 +0100 Subject: [PATCH 1/4] update duplicate dependencies list --- deny.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/deny.toml b/deny.toml index 4967b53e78a9b..23cc802cbda0c 100644 --- a/deny.toml +++ b/deny.toml @@ -46,13 +46,15 @@ skip = [ { name = "darling", version = "0.10" }, # from rodio v0.14.0 { name = "darling_core", version = "0.10" }, # from rodio v0.14.0 { name = "darling_macro", version = "0.10" }, # from rodio v0.14.0 + { name = "hashbrown", version = "0.9" }, # from naga v0.8.2 { name = "mach", version = "0.2" }, # from gilrs v0.8.1 { name = "mio", version = "0.7" }, # from notify v5.0.0-pre.11 { name = "ndk", version = "0.3" }, # from rodio v0.14.0 - { name = "ndk", version = "0.4" }, # from rodio v0.14.0 + { name = "ndk", version = "0.5" }, # from rodio v0.14.0 { name = "ndk-macro", version = "0.2" }, # from rodio v0.14.0 { name = "ndk-glue", version = "0.3" }, # from rodio v0.14.0 - { name = "ndk-glue", version = "0.4" }, # from rodio v0.14.0 + { name = "ndk-glue", version = "0.5" }, # from rodio v0.14.0 + { name = "ndk-sys", version = "0.2" }, # from rodio v0.14.0 { name = "nix", version = "0.20" }, # from rodio v0.14.0 { name = "proc-macro-crate", version = "0.1" }, # from rodio v0.14.0 { name = "stdweb", version = "0.1" }, # from rodio v0.14.0 From d1a5c8c6b60ccf89fec361e9fc33e0eb64f85ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Thu, 13 Jan 2022 22:06:59 +0100 Subject: [PATCH 2/4] allow non_send_fields_in_send_ty on World --- crates/bevy_ecs/src/world/mod.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/bevy_ecs/src/world/mod.rs b/crates/bevy_ecs/src/world/mod.rs index 1087181adfe4c..bd4778ea35d44 100644 --- a/crates/bevy_ecs/src/world/mod.rs +++ b/crates/bevy_ecs/src/world/mod.rs @@ -1159,6 +1159,7 @@ impl fmt::Debug for World { } } +#[allow(clippy::non_send_fields_in_send_ty)] unsafe impl Send for World {} unsafe impl Sync for World {} From 1737ae553b671820140fe558dbea5bf91ae2e361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Thu, 13 Jan 2022 22:07:10 +0100 Subject: [PATCH 3/4] allow non_send_fields_in_send_ty on FlexSurface forgot to un-uncomment it??? --- crates/bevy_ui/src/flex/mod.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crates/bevy_ui/src/flex/mod.rs b/crates/bevy_ui/src/flex/mod.rs index 0bb7a573d302a..cbe1da12a4924 100644 --- a/crates/bevy_ui/src/flex/mod.rs +++ b/crates/bevy_ui/src/flex/mod.rs @@ -22,6 +22,8 @@ pub struct FlexSurface { } // SAFE: as long as MeasureFunc is Send + Sync. https://github.com/vislyhq/stretch/issues/69 +// TODO: remove allow on lint - https://github.com/bevyengine/bevy/issues/3666 +#[allow(clippy::non_send_fields_in_send_ty)] unsafe impl Send for FlexSurface {} unsafe impl Sync for FlexSurface {} From 06fd62baaac3f87ebaac1231707bc37a825e8615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Thu, 13 Jan 2022 22:16:50 +0100 Subject: [PATCH 4/4] add comment linking to tracking issue --- crates/bevy_ecs/src/world/mod.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/bevy_ecs/src/world/mod.rs b/crates/bevy_ecs/src/world/mod.rs index bd4778ea35d44..c07892a35243a 100644 --- a/crates/bevy_ecs/src/world/mod.rs +++ b/crates/bevy_ecs/src/world/mod.rs @@ -1159,6 +1159,7 @@ impl fmt::Debug for World { } } +// TODO: remove allow on lint - https://github.com/bevyengine/bevy/issues/3666 #[allow(clippy::non_send_fields_in_send_ty)] unsafe impl Send for World {} unsafe impl Sync for World {}