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

bevy_core_pipeline: Apply #![warn(clippy::allow_attributes, clippy::allow_attributes_without_reason)] #17137

Merged
merged 8 commits into from
Jan 14, 2025
Merged

bevy_core_pipeline: Apply #![warn(clippy::allow_attributes, clippy::allow_attributes_without_reason)] #17137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
675fe3f
Apply `#![deny(clippy::allow_attributes, clippy::allow_attributes_wit…
LikeLakers2 Jan 4, 2025
cacc1a2
Merge branch 'main' into lint/deny_allow_and_without_reason/bevy_core…
LikeLakers2 Jan 6, 2025
6e67fe5
I missed a `deprecated` lint
LikeLakers2 Jan 6, 2025
451f6d5
Merge branch 'main' into lint/deny_allow_and_without_reason/bevy_core…
LikeLakers2 Jan 6, 2025
8175aaf
Remove the instance of `#[expect(clippy::type_complexity)]`, as we al…
LikeLakers2 Jan 9, 2025
421c1e5
Merge branch 'main' into lint/deny_allow_and_without_reason/bevy_core…
LikeLakers2 Jan 9, 2025
1376c56
Downgrade the lints to warn - see https://github.com/bevyengine/bevy/…
LikeLakers2 Jan 12, 2025
4b8be2e
Merge branch 'main' into lint/deny_allow_and_without_reason/bevy_core…
LikeLakers2 Jan 14, 2025
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
5 changes: 4 additions & 1 deletion crates/bevy_core_pipeline/src/auto_exposure/compensation_curve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,10 @@ impl AutoExposureCompensationCurve {
let lut_inv_range = 1.0 / (lut_end - lut_begin);

// Iterate over all LUT entries whose pixel centers fall within the current segment.
#[allow(clippy::needless_range_loop)]
#[expect(
clippy::needless_range_loop,
reason = "This for-loop also uses `i` to calculate a value `t`."
)]
Copy link
Contributor Author

@LikeLakers2 LikeLakers2 Jan 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

I want to mention: I actually spent some time seeing if I could rewrite this loop to use an iterator (as the lint suggests to do).

However, I ultimately opted not to do so, as I found that I couldn't easily get i to be the same values without some very awkward-looking code.

I don't believe it's impossible to make an iterator work here though.

Copy link
Contributor

@Bleachfuel Bleachfuel Jan 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

maybe

let iter  = lut_begin.ceil() as usize..=lut_end.floor() as usize

for i in iter {
}

seems a bit unnessecary tbh.

Copy link
Contributor Author

@LikeLakers2 LikeLakers2 Jan 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

For what it's worth, that would silence the lint - but I suspect that that's a false negative with clippy. Hence, I don't think it would be a good idea compared to just silencing the lint as I have.

for i in lut_begin.ceil() as usize..=lut_end.floor() as usize {
let t = (i as f32 - lut_begin) * lut_inv_range;
lut[i] = previous.y.lerp(current.y, t);
Expand Down
5 changes: 5 additions & 0 deletions crates/bevy_core_pipeline/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#![expect(missing_docs, reason = "Not all docs are written yet, see #3492.")]
#![forbid(unsafe_code)]
#![warn(
clippy::allow_attributes,
clippy::allow_attributes_without_reason,
reason = "See #17111; To be removed once all crates are in-line with these attributes"
)]
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
#![doc(
html_logo_url = "https://bevyengine.org/assets/icon.png",
Expand Down
7 changes: 5 additions & 2 deletions crates/bevy_core_pipeline/src/tonemapping/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,11 @@ pub fn get_lut_bind_group_layout_entries() -> [BindGroupLayoutEntryBuilder; 2] {
]
}

// allow(dead_code) so it doesn't complain when the tonemapping_luts feature is disabled
#[allow(dead_code)]
#[expect(clippy::allow_attributes, reason = "`dead_code` is not always linted.")]
#[allow(
dead_code,
reason = "There is unused code when the `tonemapping_luts` feature is disabled."
)]
fn setup_tonemapping_lut_image(bytes: &[u8], image_type: ImageType) -> Image {
let image_sampler = ImageSampler::Descriptor(bevy_image::ImageSamplerDescriptor {
label: Some("Tonemapping LUT sampler".to_string()),
Expand Down
Loading