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

Run cargo fmt with Rust 1.72

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-08-26 01:31:11 +02:00
parent 96b435488a
commit 36120d5685
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
3 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tiny_skia/src/geometry.rs
View file

@ -39,7 +39,9 @@ impl Frame {
} }
pub fn fill(&mut self, path: &Path, fill: impl Into<Fill>) { pub fn fill(&mut self, path: &Path, fill: impl Into<Fill>) {
let Some(path) = convert_path(path) else { return }; let Some(path) = convert_path(path) else {
return;
};
let fill = fill.into(); let fill = fill.into();
self.primitives self.primitives
@ -57,7 +59,9 @@ impl Frame {
size: Size, size: Size,
fill: impl Into<Fill>, fill: impl Into<Fill>,
) { ) {
let Some(path) = convert_path(&Path::rectangle(top_left, size)) else { return }; let Some(path) = convert_path(&Path::rectangle(top_left, size)) else {
return;
};
let fill = fill.into(); let fill = fill.into();
self.primitives self.primitives
@ -73,7 +77,9 @@ impl Frame {
} }
pub fn stroke<'a>(&mut self, path: &Path, stroke: impl Into<Stroke<'a>>) { pub fn stroke<'a>(&mut self, path: &Path, stroke: impl Into<Stroke<'a>>) {
let Some(path) = convert_path(path) else { return }; let Some(path) = convert_path(path) else {
return;
};
let stroke = stroke.into(); let stroke = stroke.into();
let skia_stroke = into_stroke(&stroke); let skia_stroke = into_stroke(&stroke);

12
widget/src/scrollable.rs
View file

@ -593,7 +593,7 @@ pub fn update<Message>(
match event { match event {
touch::Event::FingerPressed { .. } => { touch::Event::FingerPressed { .. } => {
let Some(cursor_position) = cursor.position() else { let Some(cursor_position) = cursor.position() else {
return event::Status::Ignored return event::Status::Ignored;
}; };
state.scroll_area_touched_at = Some(cursor_position); state.scroll_area_touched_at = Some(cursor_position);
@ -603,7 +603,7 @@ pub fn update<Message>(
state.scroll_area_touched_at state.scroll_area_touched_at
{ {
let Some(cursor_position) = cursor.position() else { let Some(cursor_position) = cursor.position() else {
return event::Status::Ignored return event::Status::Ignored;
}; };
let delta = Vector::new( let delta = Vector::new(
@ -648,7 +648,7 @@ pub fn update<Message>(
| Event::Touch(touch::Event::FingerMoved { .. }) => { | Event::Touch(touch::Event::FingerMoved { .. }) => {
if let Some(scrollbar) = scrollbars.y { if let Some(scrollbar) = scrollbars.y {
let Some(cursor_position) = cursor.position() else { let Some(cursor_position) = cursor.position() else {
return event::Status::Ignored return event::Status::Ignored;
}; };
state.scroll_y_to( state.scroll_y_to(
@ -678,7 +678,7 @@ pub fn update<Message>(
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
| Event::Touch(touch::Event::FingerPressed { .. }) => { | Event::Touch(touch::Event::FingerPressed { .. }) => {
let Some(cursor_position) = cursor.position() else { let Some(cursor_position) = cursor.position() else {
return event::Status::Ignored return event::Status::Ignored;
}; };
if let (Some(scroller_grabbed_at), Some(scrollbar)) = if let (Some(scroller_grabbed_at), Some(scrollbar)) =
@ -722,7 +722,7 @@ pub fn update<Message>(
Event::Mouse(mouse::Event::CursorMoved { .. }) Event::Mouse(mouse::Event::CursorMoved { .. })
| Event::Touch(touch::Event::FingerMoved { .. }) => { | Event::Touch(touch::Event::FingerMoved { .. }) => {
let Some(cursor_position) = cursor.position() else { let Some(cursor_position) = cursor.position() else {
return event::Status::Ignored return event::Status::Ignored;
}; };
if let Some(scrollbar) = scrollbars.x { if let Some(scrollbar) = scrollbars.x {
@ -753,7 +753,7 @@ pub fn update<Message>(
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
| Event::Touch(touch::Event::FingerPressed { .. }) => { | Event::Touch(touch::Event::FingerPressed { .. }) => {
let Some(cursor_position) = cursor.position() else { let Some(cursor_position) = cursor.position() else {
return event::Status::Ignored return event::Status::Ignored;
}; };
if let (Some(scroller_grabbed_at), Some(scrollbar)) = if let (Some(scroller_grabbed_at), Some(scrollbar)) =

8
widget/src/text_input.rs
View file

@ -693,7 +693,9 @@ where
let state = state(); let state = state();
if let Some(focus) = &mut state.is_focused { if let Some(focus) = &mut state.is_focused {
let Some(on_input) = on_input else { return event::Status::Ignored }; let Some(on_input) = on_input else {
return event::Status::Ignored;
};
if state.is_pasting.is_none() if state.is_pasting.is_none()
&& !state.keyboard_modifiers.command() && !state.keyboard_modifiers.command()
@ -716,7 +718,9 @@ where
let state = state(); let state = state();
if let Some(focus) = &mut state.is_focused { if let Some(focus) = &mut state.is_focused {
let Some(on_input) = on_input else { return event::Status::Ignored }; let Some(on_input) = on_input else {
return event::Status::Ignored;
};
let modifiers = state.keyboard_modifiers; let modifiers = state.keyboard_modifiers;
focus.updated_at = Instant::now(); focus.updated_at = Instant::now();