Merge pull request #1396 from dtolnay/macrodelimspan

Add MacroDelimiter::span method
dtolnay · Mar 13, 2023 · c7c1292 · c7c1292
2 parents 182f6e8 + 7e84b26
commit c7c1292
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/attr.rs b/src/attr.rs
@@ -257,7 +257,7 @@ impl Attribute {
                 Err(Error::new(meta.eq_token.span, msg))
             }
             Meta::List(meta) => {
-                let scope = crate::mac::delimiter_span_close(&meta.delimiter);
+                let scope = meta.delimiter.span().close();
                 crate::parse::parse_scoped(parser, scope, meta.tokens.clone())
             }
         }

diff --git a/src/mac.rs b/src/mac.rs
@@ -1,10 +1,11 @@
 use super::*;
 use crate::token::{Brace, Bracket, Paren};
+use proc_macro2::extra::DelimSpan;
 #[cfg(any(feature = "parsing", feature = "printing"))]
 use proc_macro2::Delimiter;
 use proc_macro2::TokenStream;
 #[cfg(feature = "parsing")]
-use proc_macro2::{Span, TokenTree};
+use proc_macro2::TokenTree;
 
 #[cfg(feature = "parsing")]
 use crate::parse::{Parse, ParseStream, Parser, Result};
@@ -30,14 +31,14 @@ ast_enum! {
     }
 }
 
-#[cfg(feature = "parsing")]
-pub(crate) fn delimiter_span_close(macro_delimiter: &MacroDelimiter) -> Span {
-    let delim_span = match macro_delimiter {
-        MacroDelimiter::Paren(token) => &token.span,
-        MacroDelimiter::Brace(token) => &token.span,
-        MacroDelimiter::Bracket(token) => &token.span,
-    };
-    delim_span.close()
+impl MacroDelimiter {
+    pub fn span(&self) -> &DelimSpan {
+        match self {
+            MacroDelimiter::Paren(token) => &token.span,
+            MacroDelimiter::Brace(token) => &token.span,
+            MacroDelimiter::Bracket(token) => &token.span,
+        }
+    }
 }
 
 impl Macro {
@@ -134,7 +135,7 @@ impl Macro {
     #[cfg(feature = "parsing")]
     #[cfg_attr(doc_cfg, doc(cfg(feature = "parsing")))]
     pub fn parse_body_with<F: Parser>(&self, parser: F) -> Result<F::Output> {
-        let scope = delimiter_span_close(&self.delimiter);
+        let scope = self.delimiter.span().close();
         crate::parse::parse_scoped(parser, scope, self.tokens.clone())
     }
 }