Re-add rust-analyzer as a subtree

src/tools/rust-analyzer/crates/proc-macro-srv/src/abis/abi_sysroot/rustc_server.rs

@@ -288,7 +288,7 @@ impl server::FreeFunctions for Rustc {
         &mut self,
         _s: &str,
     ) -> Result<bridge::Literal<Self::Span, Self::Symbol>, ()> {
-        todo!("implement literal_from_str")
+        panic!("FIXME: implement literal_from_str")
     }
 }
 
@@ -319,7 +319,7 @@ impl server::TokenStream for Rustc {
             }
 
             bridge::TokenTree::Ident(ident) => {
-                // TODO: what about raw idents?
+                // FIXME: handle raw idents?
                 let text = SYMBOL_INTERNER.lock().unwrap().get(&ident.sym).clone();
                 let ident: tt::Ident = tt::Ident { text, id: ident.span };
                 let leaf = tt::Leaf::from(ident);
@@ -400,14 +400,14 @@ impl server::TokenStream for Rustc {
                 tt::TokenTree::Leaf(tt::Leaf::Ident(ident)) => {
                     bridge::TokenTree::Ident(bridge::Ident {
                         sym: SYMBOL_INTERNER.lock().unwrap().intern(&ident.text),
-                        // TODO: handle raw idents
+                        // FIXME: handle raw idents
                         is_raw: false,
                         span: ident.id,
                     })
                 }
                 tt::TokenTree::Leaf(tt::Leaf::Literal(lit)) => {
                     bridge::TokenTree::Literal(bridge::Literal {
-                        // TODO: implement literal_from_str
+                        // FIXME: implement literal_from_str
                         kind: bridge::LitKind::Err,
                         symbol: SYMBOL_INTERNER.lock().unwrap().intern(&lit.text),
                         suffix: None,
@@ -711,7 +711,7 @@ impl server::MultiSpan for Rustc {
 
 impl server::Symbol for Rustc {
     fn normalize_and_validate_ident(&mut self, _string: &str) -> Result<Self::Symbol, ()> {
-        todo!()
+        panic!("FIXME: normalize and validate ident")
     }
 }
 

src/tools/rust-analyzer/crates/proc-macro-srv/src/tests/mod.rs

@@ -56,6 +56,19 @@ fn test_fn_like_macro2() {
     );
 }
 
+#[test]
+fn test_fn_like_clone_literal() {
+    assert_expand(
+        "fn_like_clone_tokens",
+        r#"42_u64"#,
+        expect![[r#"
+            SUBTREE $
+              IDENT   ident 4294967295
+              PUNCH   , [alone] 4294967295
+              SUBTREE [] 4294967295"#]],
+    );
+}
+
 #[test]
 fn test_attr_macro() {
     // Corresponds to

src/tools/rust-analyzer/crates/proc-macro-test/imp/src/lib.rs

@@ -1,6 +1,6 @@
 //! Exports a few trivial procedural macros for testing.
 
-use proc_macro::{Group, Ident, Punct, TokenStream, TokenTree};
+use proc_macro::{Group, Ident, Punct, TokenStream, TokenTree, Literal};
 
 #[proc_macro]
 pub fn fn_like_noop(args: TokenStream) -> TokenStream {
@@ -69,6 +69,10 @@ fn clone_tree(t: TokenTree) -> TokenTree {
             new.set_span(orig.span());
             TokenTree::Punct(new)
         }
-        TokenTree::Literal(_orig) => unimplemented!(),
+        TokenTree::Literal(orig) => {
+            let mut lit: Literal = orig.to_string().parse().unwrap();
+            lit.set_span(orig.span());
+            TokenTree::Literal(lit)
+        },
     }
 }