Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - Ignore clippy 1.58 #3667

Closed
wants to merge 4 commits into from
Closed

[Merged by Bors] - Ignore clippy 1.58 #3667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f73369
update duplicate dependencies list
mockersf Jan 13, 2022
d1a5c8c
allow non_send_fields_in_send_ty on World
mockersf Jan 13, 2022
1737ae5
allow non_send_fields_in_send_ty on FlexSurface
mockersf Jan 13, 2022
06fd62b
add comment linking to tracking issue
mockersf Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions crates/bevy_ecs/src/world/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1159,6 +1159,8 @@ 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)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should really have a comment here that this is in fact unsound, and linking to #3519.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added links to #3666

unsafe impl Send for World {}
unsafe impl Sync for World {}

Expand Down
2 changes: 2 additions & 0 deletions crates/bevy_ui/src/flex/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}

Expand Down
6 changes: 4 additions & 2 deletions deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down