From d440a3992e8a0fa49857210e646b0d653dfa7675 Mon Sep 17 00:00:00 2001 From: srdusr <99972264+srdusr@users.noreply.github.com> Date: Fri, 21 Aug 2026 19:24:00 +0200 Subject: Put back the allow attribute my last commit orphaned Inserting the title-elision helper directly above render_titlebar pushed that function away from its own #[allow(clippy::too_many_arguments)], which then applied to a const and left the function warning again. Third time I have done this to an attribute in this tree; the pattern is inserting at a "just before this function" anchor without checking what sits immediately above it. Also `"x".repeat(20_000)` in the new test, which clippy asked for. Clippy is clean again - and it was not when I said it was in the previous commit: the check printed its own "ok" line unconditionally, so three real warnings scrolled past above it. --- crates/wayland/src/decoration/tests.rs | 2 +- crates/wayland/src/decoration/titlebar.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/wayland/src/decoration/tests.rs b/crates/wayland/src/decoration/tests.rs index 0f1a9ab..c777f06 100644 --- a/crates/wayland/src/decoration/tests.rs +++ b/crates/wayland/src/decoration/tests.rs @@ -1010,7 +1010,7 @@ fn a_titlebar_with_no_room_at_all_draws_no_title() { #[test] fn a_pathologically_long_title_is_bounded() { let Some(font) = super::font::find_system_font() else { return }; - let huge: String = std::iter::repeat('x').take(20_000).collect(); + let huge = "x".repeat(20_000); let laid_out = super::titlebar::lay_out_title(&font, &huge, 400.0); assert!(laid_out.len() < super::titlebar::MAX_TITLE_CHARS); } diff --git a/crates/wayland/src/decoration/titlebar.rs b/crates/wayland/src/decoration/titlebar.rs index e03c5e9..cc861ab 100644 --- a/crates/wayland/src/decoration/titlebar.rs +++ b/crates/wayland/src/decoration/titlebar.rs @@ -35,7 +35,6 @@ use super::font::{blit_glyph, find_system_font, FONT_PIXELS, TEXT_LEFT_PADDING}; /// titlebar (there is none in practice - an undecorated window has no /// titlebar at all - but `0` is also the correct, harmless value if /// `round_corners` handling ever changes to allow it). -#[allow(clippy::too_many_arguments)] /// The most characters of a title that are ever measured. /// /// Nothing legible survives past this in any titlebar a person would use, @@ -96,6 +95,7 @@ pub(crate) fn lay_out_title(font: &fontdue::Font, title: &str, available: f32) - glyphs } +#[allow(clippy::too_many_arguments)] pub fn render_titlebar( width: u32, height: u32, -- cgit v1.2.3