Use proc_macro::Span instead of proc_macro2::Span.

proc_macro2's spans are sometimes empty/zero.

Author: m-ou-se

macros/src/embed_python.rs

@@ -1,4 +1,5 @@
-use proc_macro2::{Delimiter, Ident, LineColumn, Spacing, Span, TokenStream, TokenTree};
+use proc_macro::{LineColumn, Span};
+use proc_macro2::{Delimiter, Ident, Spacing, TokenStream, TokenTree};
 use quote::quote_spanned;
 use std::collections::BTreeMap;
 use std::fmt::Write;
@@ -30,7 +31,7 @@ impl EmbedPython {
 			}
 			let first_indent = *self.first_indent.get_or_insert(loc.column);
 			let indent = loc.column.checked_sub(first_indent);
-			let indent = indent.ok_or_else(|| quote_spanned!(span => compile_error!{"Invalid indentation"}))?;
+			let indent = indent.ok_or_else(|| quote_spanned!(span.into() => compile_error!{"Invalid indentation"}))?;
 			for _ in 0..indent {
 				self.python.push(' ');
 			}
@@ -49,8 +50,8 @@ impl EmbedPython {
 		let mut tokens = input.into_iter();
 
 		while let Some(token) = tokens.next() {
-			let span = token.span();
-			self.add_whitespace(span, token.span().start())?;
+			let span = token.span().unwrap();
+			self.add_whitespace(span, span.start())?;
 
 			match &token {
 				TokenTree::Group(x) => {
@@ -63,7 +64,7 @@ impl EmbedPython {
 					self.python.push_str(start);
 					self.loc.column += start.len();
 					self.add(x.stream())?;
-					let mut end_loc = token.span().end();
+					let mut end_loc = token.span().unwrap().end();
 					end_loc.column = end_loc.column.saturating_sub(end.len());
 					self.add_whitespace(span, end_loc)?;
 					self.python.push_str(end);
@@ -104,11 +105,11 @@ impl EmbedPython {
 				}
 				TokenTree::Ident(x) => {
 					write!(&mut self.python, "{}", x).unwrap();
-					self.loc = token.span().end();
+					self.loc = token.span().unwrap().end();
 				}
 				TokenTree::Literal(x) => {
 					write!(&mut self.python, "{}", x).unwrap();
-					self.loc = token.span().end();
+					self.loc = token.span().unwrap().end();
 				}
 			}
 		}

macros/src/error.rs

@@ -1,4 +1,5 @@
-use proc_macro2::{Span, TokenStream};
+use proc_macro::Span;
+use proc_macro2::TokenStream;
 use pyo3::type_object::PyTypeObject;
 use pyo3::{AsPyRef, PyAny, PyErr, PyResult, Python, ToPyObject};
 use quote::{quote, quote_spanned};
@@ -18,18 +19,18 @@ pub fn compile_error_msg(py: Python, error: PyErr, tokens: TokenStream) -> Token
 		if let (Some(line), Some(msg)) = (line, msg) {
 			if let Some(span) = span_for_line(tokens.clone(), line) {
 				let error = format!("python: {}", msg);
-				return quote_spanned!(span => compile_error!{#error});
+				return quote_spanned!(span.into() => compile_error!{#error});
 			}
 		}
 	}
 
 	if let Some(tb) = &error.ptraceback {
 		if let Ok((file, line)) = get_traceback_info(tb.as_ref(py)) {
-			if file == Span::call_site().unwrap().source_file().path().to_string_lossy() {
+			if file == Span::call_site().source_file().path().to_string_lossy() {
 				if let Ok(msg) = value.as_ref(py).str() {
 					if let Some(span) = span_for_line(tokens, line) {
 						let error = format!("python: {}", msg);
-						return quote_spanned!(span => compile_error!{#error});
+						return quote_spanned!(span.into() => compile_error!{#error});
 					}
 				}
 			}
@@ -64,5 +65,5 @@ fn span_for_line(input: TokenStream, line: usize) -> Option<Span> {
 		}
 	}
 
-	Some(Span::from(result))
+	Some(result)
 }

macros/src/lib.rs

@@ -5,8 +5,8 @@
 extern crate proc_macro;
 
 use self::embed_python::EmbedPython;
-use proc_macro::TokenStream as TokenStream1;
-use proc_macro2::{Literal, Span, TokenStream};
+use proc_macro::{Span, TokenStream as TokenStream1};
+use proc_macro2::{Literal, TokenStream};
 use pyo3::{ffi, types::PyBytes, AsPyPointer, FromPyPointer, PyObject, Python};
 use quote::quote;
 use std::ffi::CString;
@@ -20,7 +20,7 @@ fn python_impl(input: TokenStream) -> Result<TokenStream, TokenStream> {
 
 	check_no_attribute(input.clone())?;
 
-	let filename = Span::call_site().unwrap().source_file().path().to_string_lossy().into_owned();
+	let filename = Span::call_site().source_file().path().to_string_lossy().into_owned();
 
 	let mut x = EmbedPython::new();
 
@@ -65,7 +65,7 @@ fn python_impl(input: TokenStream) -> Result<TokenStream, TokenStream> {
 fn ct_python_impl(input: TokenStream) -> Result<TokenStream, TokenStream> {
 	let tokens = input.clone();
 
-	let filename = Span::call_site().unwrap().source_file().path().to_string_lossy().into_owned();
+	let filename = Span::call_site().source_file().path().to_string_lossy().into_owned();
 
 	let mut x = EmbedPython::new();