about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-09-27 17:43:32 +0000
committerGitHub <noreply@github.com>2021-09-27 17:43:32 +0000
commitafa9e31b80b4305352589098b001b1bec5020933 (patch)
tree23673733aeaf75abc8e6b35fa3f61672472e79ca
parentbcf04b19f80a77353c54b5919897ed5c5087687e (diff)
parent9641bc7369302f45a8c4ada0ec8e95391e39ba6d (diff)
downloadrust-afa9e31b80b4305352589098b001b1bec5020933.tar.gz
rust-afa9e31b80b4305352589098b001b1bec5020933.zip
Merge #10377
10377: fix: fix proc macro crash on nightly r=jonas-schievink a=jonas-schievink

Fixes https://github.com/rust-analyzer/rust-analyzer/issues/10235

bors r+

Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
-rw-r--r--crates/proc_macro_srv/src/abis/abi_1_56/rustc_server.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/crates/proc_macro_srv/src/abis/abi_1_56/rustc_server.rs b/crates/proc_macro_srv/src/abis/abi_1_56/rustc_server.rs
index b0c2681f713..082cdd0a952 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_56/rustc_server.rs
+++ b/crates/proc_macro_srv/src/abis/abi_1_56/rustc_server.rs
@@ -653,10 +653,12 @@ impl server::Span for Rustc {
         unimplemented!()
     }
     fn save_span(&mut self, _span: Self::Span) -> usize {
-        unimplemented!()
+        // FIXME stub
+        0
     }
     fn recover_proc_macro_span(&mut self, _id: usize) -> Self::Span {
-        unimplemented!()
+        // FIXME stub
+        tt::TokenId::unspecified()
     }
     /// Recent feature, not yet in the proc_macro
     ///