about summary refs log tree commit diff
path: root/src/libproc_macro
diff options
context:
space:
mode:
authorJeffrey Seyfried <jeffrey.seyfried@gmail.com>2017-11-14 21:44:43 -0800
committerJeffrey Seyfried <jeffrey.seyfried@gmail.com>2017-11-14 21:53:37 -0800
commit74cc1fdb52379320bc5dd3f48366d04f0a97d614 (patch)
tree8e0b9bbf541189c219614d21f0c018a179b0f955 /src/libproc_macro
parent8a98531973f9af8010a3aebcdbf5591a59029f91 (diff)
downloadrust-74cc1fdb52379320bc5dd3f48366d04f0a97d614.tar.gz
rust-74cc1fdb52379320bc5dd3f48366d04f0a97d614.zip
Rename `Span::default` -> `Span::def_site`.
Diffstat (limited to 'src/libproc_macro')
-rw-r--r--src/libproc_macro/lib.rs9
-rw-r--r--src/libproc_macro/quote.rs2
2 files changed, 6 insertions, 5 deletions
diff --git a/src/libproc_macro/lib.rs b/src/libproc_macro/lib.rs
index 8a400f3e636..22f788e34ec 100644
--- a/src/libproc_macro/lib.rs
+++ b/src/libproc_macro/lib.rs
@@ -177,9 +177,10 @@ impl TokenStream {
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub struct Span(syntax_pos::Span);
 
-#[unstable(feature = "proc_macro", issue = "38356")]
-impl Default for Span {
-    fn default() -> Span {
+impl Span {
+    /// A span that resolves at the macro definition site.
+    #[unstable(feature = "proc_macro", issue = "38356")]
+    pub fn def_site() -> Span {
         ::__internal::with_sess(|(_, mark)| {
             let call_site = mark.expn_info().unwrap().call_site;
             Span(call_site.with_ctxt(SyntaxContext::empty().apply_mark(mark)))
@@ -351,7 +352,7 @@ pub struct TokenTree {
 #[unstable(feature = "proc_macro", issue = "38356")]
 impl From<TokenNode> for TokenTree {
     fn from(kind: TokenNode) -> TokenTree {
-        TokenTree { span: Span::default(), kind: kind }
+        TokenTree { span: Span::def_site(), kind: kind }
     }
 }
 
diff --git a/src/libproc_macro/quote.rs b/src/libproc_macro/quote.rs
index 26f88ad6bf6..8b5add1a0f0 100644
--- a/src/libproc_macro/quote.rs
+++ b/src/libproc_macro/quote.rs
@@ -168,7 +168,7 @@ impl Quote for Term {
 
 impl Quote for Span {
     fn quote(self) -> TokenStream {
-        quote!(::Span::default())
+        quote!(::Span::def_site())
     }
 }