forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bevy_ecs: remove use of needless_return (#19859)

Browse Source 
# Objective

- bevy_ecs has a expected lint that is both needed and unneeded

## Solution

- Change the logic so that it's always not needed

## Testing

`cargo clippy -p bevy_ecs --no-default-features --no-deps -- -D
warnings`
This commit is contained in:
François Mockers 2025-06-29 19:12:33 +02:00 committed by GitHub
parent 8e12b1f0b2
commit 1fe559730c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/bevy_ecs/src/storage/resource.rs
View File

@ -64,17 +64,7 @@ impl<const SEND: bool> ResourceData<SEND> {
/// If `SEND` is false, this will panic if called from a different thread than the one it was inserted from. /// If `SEND` is false, this will panic if called from a different thread than the one it was inserted from.
#[inline] #[inline]
fn validate_access(&self) { fn validate_access(&self) {
if SEND { if !SEND {
#[cfg_attr(
not(feature = "std"),
expect(
clippy::needless_return,
reason = "needless until no_std is addressed (see below)",
)
)]
return;
}
#[cfg(feature = "std")] #[cfg(feature = "std")]
if self.origin_thread_id != Some(std::thread::current().id()) { if self.origin_thread_id != Some(std::thread::current().id()) {
// Panic in tests, as testing for aborting is nearly impossible // Panic in tests, as testing for aborting is nearly impossible
@ -91,6 +81,7 @@ impl<const SEND: bool> ResourceData<SEND> {
// To support no_std multithreading, an alternative will be required. // To support no_std multithreading, an alternative will be required.
// Remove the #[expect] attribute above when this is addressed. // Remove the #[expect] attribute above when this is addressed.
} }
}
/// Returns true if the resource is populated. /// Returns true if the resource is populated.
#[inline] #[inline]