Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions slack-messaging-derive/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,21 @@ impl Field {
} else {
quote! {}
};
let (setter_generic, setter_arg, setter_logic, setter_bounds) = if let InnerType::Vec(inner_ty) = InnerType::new(self.inner_ty()) {
(
quote! { <Iter, Inner> },
quote! { Iter },
quote! { val.into_iter().map(|v| v.into()).collect() },
quote! { where Iter: IntoIterator<Item = Inner>, Inner: Into<#inner_ty> }
)
} else {
(
quote! {},
quote! { impl Into<#ty> },
quote! { val.into() },
quote! {},
)
};

let push_item = match (self.push_item.as_ref(), InnerType::new(self.inner_ty())) {
(Some(expr), InnerType::Vec(inner_ty)) => {
Expand Down Expand Up @@ -144,15 +159,15 @@ impl Field {
}

#[doc = #doc_setter]
#setter_visibility fn #setter(self, value: ::std::option::Option<impl Into<#ty>>) -> Self {
#setter_visibility fn #setter #setter_generic (self, value: ::std::option::Option<#setter_arg>) -> Self #setter_bounds {
Self {
#ident: Self::#constructor_name(value.map(|v| v.into())),
#ident: Self::#constructor_name(value.map(|val| #setter_logic)),
#after_set
}
}

#[doc = #doc_setter]
#setter_visibility fn #ident(self, value: impl Into<#ty>) -> Self {
#setter_visibility fn #ident #setter_generic(self, value: #setter_arg) -> Self #setter_bounds {
self.#setter(Some(value))
}

Expand Down
9 changes: 6 additions & 3 deletions slack-messaging/src/blocks/actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -413,16 +413,19 @@ mod tests {
.set_block_id(Some("actions_0"))
.set_elements(Some(vec![
datepicker().into(),
btn("button_0", "value_0").into(),
]))
btn("button_0", "value_0").into()
] as Vec<ActionsElement>))
.build()
.unwrap();

assert_eq!(val, expected);

let val = Actions::builder()
.block_id("actions_0")
.elements(vec![datepicker().into(), btn("button_0", "value_0").into()])
.elements(vec![
datepicker().into(),
btn("button_0", "value_0").into()
] as Vec<ActionsElement>)
.build()
.unwrap();

Expand Down
1 change: 1 addition & 0 deletions slack-messaging/src/blocks/builders.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ pub use super::carousel::CarouselBuilder;
pub use super::context::ContextBuilder;
pub use super::context_actions::ContextActionsBuilder;
pub use super::data_table::DataTableBuilder;
pub use super::data_visualization::DataVisualizationBuilder;
pub use super::divider::DividerBuilder;
pub use super::file::FileBuilder;
pub use super::header::HeaderBuilder;
Expand Down
5 changes: 4 additions & 1 deletion slack-messaging/src/blocks/carousel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,10 @@ mod tests {

#[test]
fn it_requires_elements_to_have_at_least_1_item() {
let err = Carousel::builder().elements(vec![]).build().unwrap_err();
let err = Carousel::builder()
.elements(vec![] as Vec<Card>)
.build()
.unwrap_err();
assert_eq!(err.object(), "Carousel");

let errors = err.field("elements");
Expand Down
4 changes: 2 additions & 2 deletions slack-messaging/src/blocks/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,15 @@ mod tests {

let val = Context::builder()
.set_block_id(Some("context_0"))
.set_elements(Some(vec![mrkdwn_text("foo").into()]))
.set_elements(Some(vec![mrkdwn_text("foo")]))
.build()
.unwrap();

assert_eq!(val, expected);

let val = Context::builder()
.block_id("context_0")
.elements(vec![mrkdwn_text("foo").into()])
.elements(vec![mrkdwn_text("foo")])
.build()
.unwrap();

Expand Down
4 changes: 2 additions & 2 deletions slack-messaging/src/blocks/context_actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,15 +183,15 @@ mod tests {

let val = ContextActions::builder()
.set_block_id(Some("context_actions_0"))
.set_elements(Some(vec![fb_buttons().into()]))
.set_elements(Some(vec![fb_buttons()]))
.build()
.unwrap();

assert_eq!(val, expected);

let val = ContextActions::builder()
.block_id("context_actions_0")
.elements(vec![fb_buttons().into()])
.elements(vec![fb_buttons()])
.build()
.unwrap();

Expand Down
Loading