From f53cfb8efa81563b76a4b585ae8cd856dd1eb149 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 14 Feb 2024 03:54:40 +0100 Subject: Use `Borrow` for both `options` and `selected` in `PickList` --- widget/src/helpers.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'widget/src/helpers.rs') diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs index a5411c89..e9898d67 100644 --- a/widget/src/helpers.rs +++ b/widget/src/helpers.rs @@ -22,7 +22,7 @@ use crate::toggler::{self, Toggler}; use crate::tooltip::{self, Tooltip}; use crate::{Column, MouseArea, Row, Space, Themer, VerticalSlider}; -use std::borrow::Cow; +use std::borrow::Borrow; use std::ops::RangeInclusive; /// Creates a [`Column`] with the given children. @@ -264,14 +264,15 @@ where /// Creates a new [`PickList`]. /// /// [`PickList`]: crate::PickList -pub fn pick_list<'a, Message, Theme, Renderer, T>( - options: impl Into>, - selected: Option, +pub fn pick_list<'a, T, L, V, Message, Theme, Renderer>( + options: L, + selected: Option, on_selected: impl Fn(T) -> Message + 'a, -) -> PickList<'a, T, Message, Theme, Renderer> +) -> PickList<'a, T, L, V, Message, Theme, Renderer> where - T: ToString + PartialEq + 'static, - [T]: ToOwned>, + T: ToString + PartialEq + Clone + 'a, + L: Borrow<[T]> + 'a, + V: Borrow + 'a, Message: Clone, Renderer: core::text::Renderer, Theme: pick_list::StyleSheet -- cgit