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

Merge pull request #1444 from iced-rs/fix/clippy-lints

Browse source 
Fix latest `clippy` lints
This commit is contained in:
Héctor Ramón 2022-09-23 18:04:16 +02:00 • committed by GitHub
commit 489a85518b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lazy/src/cache.rs
View file

@ -9,5 +9,5 @@ pub struct Cache<'a, Message: 'a, Renderer: 'a> {
#[borrows(mut element)] #[borrows(mut element)]
#[covariant] #[covariant]
pub overlay: Option<overlay::Element<'this, Message, Renderer>>, overlay: Option<overlay::Element<'this, Message, Renderer>>,
} }

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

@ -543,9 +543,11 @@ pub fn draw<T, Renderer>(
content: label, content: label,
size: text_size, size: text_size,
font: font.clone(), font: font.clone(),
color: is_selected color: if is_selected {
.then(|| style.text_color) style.text_color
.unwrap_or(style.placeholder_color), } else {
style.placeholder_color
},
bounds: Rectangle { bounds: Rectangle {
x: bounds.x + f32::from(padding.left), x: bounds.x + f32::from(padding.left),
y: bounds.center_y() - text_size / 2.0, y: bounds.center_y() - text_size / 2.0,

24
native/src/widget/text_input.rs
View file

@ -615,25 +615,21 @@ where
keyboard::KeyCode::C keyboard::KeyCode::C
if state.keyboard_modifiers.command() => if state.keyboard_modifiers.command() =>
{ {
match state.cursor.selection(value) { if let Some((start, end)) =
Some((start, end)) => { state.cursor.selection(value)
clipboard.write( {
value.select(start, end).to_string(), clipboard
); .write(value.select(start, end).to_string());
}
None => {}
} }
} }
keyboard::KeyCode::X keyboard::KeyCode::X
if state.keyboard_modifiers.command() => if state.keyboard_modifiers.command() =>
{ {
match state.cursor.selection(value) { if let Some((start, end)) =
Some((start, end)) => { state.cursor.selection(value)
clipboard.write( {
value.select(start, end).to_string(), clipboard
); .write(value.select(start, end).to_string());
}
None => {}
} }
let mut editor = Editor::new(value, &mut state.cursor); let mut editor = Editor::new(value, &mut state.cursor);