me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Address Clippy lints

Browse source
This commit is contained in:
Poly 2022-07-04 01:17:29 +02:00 • committed by Héctor Ramón Jiménez
parent e053e25d2c
commit 15f794b7a8
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
43 changed files with 147 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

13
native/src/widget/pick_list.rs
View file

@ -160,7 +160,7 @@ where
let limits = limits.width(width).height(Length::Shrink).pad(padding);
let text_size = text_size.unwrap_or(renderer.default_size());
let text_size = text_size.unwrap_or_else(|| renderer.default_size());
let max_width = match width {
Length::Shrink => {
@ -407,10 +407,9 @@ pub fn draw<T, Renderer>(
let label = selected.map(ToString::to_string);
if let Some(label) =
label.as_ref().map(String::as_str).or_else(|| placeholder)
{
let text_size = f32::from(text_size.unwrap_or(renderer.default_size()));
if let Some(label) = label.as_deref().or(placeholder) {
let text_size =
f32::from(text_size.unwrap_or_else(|| renderer.default_size()));
renderer.fill_text(Text {
content: label,
@ -460,7 +459,7 @@ where
self.padding,
self.text_size,
&self.font,
self.placeholder.as_ref().map(String::as_str),
self.placeholder.as_deref(),
&self.options,
)
}
@ -513,7 +512,7 @@ where
self.padding,
self.text_size,
&self.font,
self.placeholder.as_ref().map(String::as_str),
self.placeholder.as_deref(),
self.selected.as_ref(),
self.style,
)