commit 9a4dca26c9e8ff52e5b9f226b36beb2fd2018503
author Alex Crichton <alex@alexcrichton.com> Wed Mar 28 06:32:19 2018 -0700
committer David Tolnay <dtolnay@gmail.com> Sat Mar 31 16:55:52 2018 +0200
tree 06c724c7c80cbe5419336bc78c27d831b2eb264e
parent 826fee0d8968cd4d0168cfb7d19e4a1e7d2f5227

Update to proc-macro2 0.3 and tweak apis

src/ident.rs

diff --git a/src/ident.rs b/src/ident.rs
index 8402420..7b0e532 100644
--- a/src/ident.rs
+++ b/src/ident.rs
@@ -99,7 +99,6 @@
 #[derive(Copy, Clone, Debug)]
 pub struct Ident {
     term: Term,
-    pub span: Span,
 }
 
 impl Ident {
@@ -145,15 +144,22 @@
         }
 
         Ident {
-            term: Term::intern(s),
-            span: span,
+            term: Term::new(s, span),
         }
     }
+
+    pub fn span(&self) -> Span {
+        self.term.span()
+    }
+
+    pub fn set_span(&mut self, span: Span) {
+        self.term.set_span(span);
+    }
 }
 
 impl<'a> From<&'a str> for Ident {
     fn from(s: &str) -> Self {
-        Ident::new(s, Span::def_site())
+        Ident::new(s, Span::call_site())
     }
 }
 
@@ -183,13 +189,13 @@
 
 impl<'a> From<Cow<'a, str>> for Ident {
     fn from(s: Cow<'a, str>) -> Self {
-        Ident::new(&s, Span::def_site())
+        Ident::new(&s, Span::call_site())
     }
 }
 
 impl From<String> for Ident {
     fn from(s: String) -> Self {
-        Ident::new(&s, Span::def_site())
+        Ident::new(&s, Span::call_site())
     }
 }
 
@@ -244,7 +250,7 @@
 
     impl Synom for Ident {
         fn parse(input: Cursor) -> PResult<Self> {
-            let (span, term, rest) = match input.term() {
+            let (term, rest) = match input.term() {
                 Some(term) => term,
                 _ => return parse_error(),
             };
@@ -265,7 +271,6 @@
 
             Ok((
                 Ident {
-                    span: span,
                     term: term,
                 },
                 rest,
@@ -282,14 +287,10 @@
 mod printing {
     use super::*;
     use quote::{ToTokens, Tokens};
-    use proc_macro2::{TokenNode, TokenTree};
 
     impl ToTokens for Ident {
         fn to_tokens(&self, tokens: &mut Tokens) {
-            tokens.append(TokenTree {
-                span: self.span,
-                kind: TokenNode::Term(self.term),
-            })
+            tokens.append(self.term);
         }
     }
 }