Inherit span from enum to variants

dtolnay · May 15, 2020 · 3a49609 · 3a49609
1 parent 57b4e92
commit 3a49609
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/impl/src/ast.rs b/impl/src/ast.rs
@@ -56,7 +56,7 @@ impl<'a> Input<'a> {
 impl<'a> Struct<'a> {
     fn from_syn(node: &'a DeriveInput, data: &'a DataStruct) -> Result<Self> {
         let mut attrs = attr::get(&node.attrs)?;
-        let span = attrs.span();
+        let span = attrs.span().unwrap_or_else(Span::call_site);
         let fields = Field::multiple_from_syn(&data.fields, span)?;
         if let Some(display) = &mut attrs.display {
             display.expand_shorthand(&fields);
@@ -74,11 +74,12 @@ impl<'a> Struct<'a> {
 impl<'a> Enum<'a> {
     fn from_syn(node: &'a DeriveInput, data: &'a DataEnum) -> Result<Self> {
         let attrs = attr::get(&node.attrs)?;
+        let span = attrs.span().unwrap_or_else(Span::call_site);
         let variants = data
             .variants
             .iter()
             .map(|node| {
-                let mut variant = Variant::from_syn(node)?;
+                let mut variant = Variant::from_syn(node, span)?;
                 if let display @ None = &mut variant.attrs.display {
                     *display = attrs.display.clone();
                 }
@@ -101,9 +102,9 @@ impl<'a> Enum<'a> {
 }
 
 impl<'a> Variant<'a> {
-    fn from_syn(node: &'a syn::Variant) -> Result<Self> {
+    fn from_syn(node: &'a syn::Variant, span: Span) -> Result<Self> {
         let attrs = attr::get(&node.attrs)?;
-        let span = attrs.span();
+        let span = attrs.span().unwrap_or(span);
         Ok(Variant {
             original: node,
             attrs,
@@ -136,3 +137,15 @@ impl<'a> Field<'a> {
         })
     }
 }
+
+impl Attrs<'_> {
+    pub fn span(&self) -> Option<Span> {
+        if let Some(display) = &self.display {
+            Some(display.fmt.span())
+        } else if let Some(transparent) = &self.transparent {
+            Some(transparent.span)
+        } else {
+            None
+        }
+    }
+}
diff --git a/impl/src/attr.rs b/impl/src/attr.rs
@@ -188,15 +188,3 @@ impl ToTokens for Display<'_> {
         });
     }
 }
-
-impl Attrs<'_> {
-    pub fn span(&self) -> Span {
-        if let Some(display) = &self.display {
-            display.fmt.span()
-        } else if let Some(transparent) = &self.transparent {
-            transparent.span
-        } else {
-            Span::call_site()
-        }
-    }
-}