From 589eacc2c3dfbe89f9fa7287b0efb6e6cde216a1 Mon Sep 17 00:00:00 2001
From: Nahor <nahor.j+github@gmail.com>
Date: Sat, 17 Feb 2024 10:55:56 -0800
Subject: [PATCH] feat(collection): remove unnecessary `OptionalWrapper`

- In a label collection, there is no need for a `None` label. One should
  just not add that label
- Code wise it is also incorrect. The wrapper will be for a vector of
  spans, not for individual spans. It happens to work anyway, but this was
  not the intended use.
---
 miette-derive/src/label.rs | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/miette-derive/src/label.rs b/miette-derive/src/label.rs
index 5e1243a..ab2ceac 100644
--- a/miette-derive/src/label.rs
+++ b/miette-derive/src/label.rs
@@ -197,7 +197,7 @@ impl Labels {
             let Label {
                 span,
                 label,
-                ty,
+                ty: _,
                 lbl_ty,
             } = label;
             if *lbl_ty != LabelType::Collection {
@@ -212,16 +212,13 @@ impl Labels {
             Some(quote! {
                 .chain({
                     let display = #display;
-                    self.#span.iter().map(move |label| {
-                        miette::macro_helpers::OptionalWrapper::<#ty>::new().to_option(label)
-                            .map(|span| {
-                                use miette::macro_helpers::{ToLabelSpanWrapper,ToLabeledSpan};
-                                let mut labeled_span = ToLabelSpanWrapper::to_labeled_span(span.clone());
-                                if display.is_some() && labeled_span.label().is_none() {
-                                    labeled_span.set_label(display.clone())
-                                }
-                                labeled_span
-                            })
+                    self.#span.iter().map(move |span| {
+                        use miette::macro_helpers::{ToLabelSpanWrapper,ToLabeledSpan};
+                        let mut labeled_span = ToLabelSpanWrapper::to_labeled_span(span.clone());
+                        if display.is_some() && labeled_span.label().is_none() {
+                            labeled_span.set_label(display.clone())
+                        }
+                        Some(labeled_span)
                     })
                 })
             })
@@ -284,7 +281,7 @@ impl Labels {
                         })
                     });
                     let collections_chain = labels.0.iter().filter_map(|label| {
-                        let Label { span, label, ty, lbl_ty } = label;
+                        let Label { span, label, ty: _, lbl_ty } = label;
                         if *lbl_ty != LabelType::Collection {
                             return None;
                         }
@@ -303,16 +300,13 @@ impl Labels {
                         Some(quote! {
                             .chain({
                                 let display = #display;
-                                #field.iter().map(move |label| {
-                                    miette::macro_helpers::OptionalWrapper::<#ty>::new().to_option(label)
-                                        .map(|span| {
-                                            use miette::macro_helpers::{ToLabelSpanWrapper,ToLabeledSpan};
-                                            let mut labeled_span = ToLabelSpanWrapper::to_labeled_span(span.clone());
-                                            if display.is_some() && labeled_span.label().is_none() {
-                                                labeled_span.set_label(display.clone());
-                                            }
-                                            labeled_span
-                                        })
+                                #field.iter().map(move |span| {
+                                    use miette::macro_helpers::{ToLabelSpanWrapper,ToLabeledSpan};
+                                    let mut labeled_span = ToLabelSpanWrapper::to_labeled_span(span.clone());
+                                    if display.is_some() && labeled_span.label().is_none() {
+                                        labeled_span.set_label(display.clone());
+                                    }
+                                    Some(labeled_span)
                                 })
                             })
                         })