Merge pull request #1467 from danielhenrymantilla/located_at_error

*Resolve* spanned errors at call/mixed site
dtolnay · Jun 8, 2023 · 145142a · 145142a
2 parents 2a001f4 + a091982
commit 145142a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/error.rs b/src/error.rs
@@ -273,9 +273,10 @@ impl Error {
 
 impl ErrorMessage {
     fn to_compile_error(&self) -> TokenStream {
-        let (start, end) = match self.span.get() {
-            Some(range) => (range.start, range.end),
-            None => (Span::call_site(), Span::call_site()),
+        let (mut start, mut end) = (Span::mixed_site(), Span::mixed_site());
+        if let Some(range) = self.span.get() {
+            start = start.located_at(range.start);
+            end = end.located_at(range.end);
         };
 
         // ::core::compile_error!($message)