Merge #10377

bors[bot] · jonas-schievink · web-flow · commit afa9e31b80b4 · 2021-09-27T17:43:32.000Z
10377: fix: fix proc macro crash on nightly r=jonas-schievink a=jonas-schievink Fixes #10235 bors r+ Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
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
@@ -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
     ///

Original file line number	Diff line number	Diff line change
`@@ -653,10 +653,12 @@ impl server::Span for Rustc {`
`653`	`653`	`unimplemented!()`
`654`	`654`	`}`
`655`	`655`	`fn save_span(&mut self, _span: Self::Span) -> usize {`
`656`		`- unimplemented!()`
	`656`	`+ // FIXME stub`
	`657`	`+ 0`
`657`	`658`	`}`
`658`	`659`	`fn recover_proc_macro_span(&mut self, _id: usize) -> Self::Span {`
`659`		`- unimplemented!()`
	`660`	`+ // FIXME stub`
	`661`	`+ tt::TokenId::unspecified()`
`660`	`662`	`}`
`661`	`663`	`/// Recent feature, not yet in the proc_macro`
`662`	`664`	`///`