diff options
Diffstat (limited to 'mingling_picker/src/picker')
| -rw-r--r-- | mingling_picker/src/picker/parse.rs | 2 | ||||
| -rw-r--r-- | mingling_picker/src/picker/patterns.rs | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/mingling_picker/src/picker/parse.rs b/mingling_picker/src/picker/parse.rs index 8f7d514..698baac 100644 --- a/mingling_picker/src/picker/parse.rs +++ b/mingling_picker/src/picker/parse.rs @@ -124,7 +124,7 @@ internal_repeat!(1..=32 => { } else { if error_route.is_none() { if let Some(get_route) = self.route_$ { - *error_route = Some(get_route()); + *error_route = Some(get_route().into()); } } other diff --git a/mingling_picker/src/picker/patterns.rs b/mingling_picker/src/picker/patterns.rs index 3c6e73f..daaf43a 100644 --- a/mingling_picker/src/picker/patterns.rs +++ b/mingling_picker/src/picker/patterns.rs @@ -10,11 +10,11 @@ internal_repeat!(1..=32 => { pub args: PickerArgs<'a>, pub error_route: Option<Route>, ( - pub arg_$: &'a PickerArg<'a, T$>, - pub result_$: PickerArgResult<T$>, - pub default_$: Option<Box<dyn FnOnce() -> T$>>, - pub route_$: Option<Box<dyn FnOnce() -> Route>>, - pub post_$: Option<Box<dyn FnOnce(T$) -> T$>>, + pub(crate) arg_$: &'a PickerArg<'a, T$>, + pub(crate) result_$: PickerArgResult<T$>, + pub(crate) default_$: Option<Box<dyn FnOnce() -> T$>>, + pub(crate) route_$: Option<Box<dyn FnOnce() -> Route>>, + pub(crate) post_$: Option<Box<dyn FnOnce(T$) -> T$>>, +) } }); @@ -99,7 +99,8 @@ internal_repeat!(1..=32 => { /// for example when composing patterns from different contexts that use different /// route enums. #[allow(clippy::type_complexity)] - pub fn with_route<NewRoute>(self) -> PickerPattern$<'a, (T$,+), NewRoute> { + pub fn with_route<NewRoute>(self) -> PickerPattern$<'a, (T$,+), NewRoute> + { PickerPattern$ { args: self.args, error_route: None, |