4 files changed, 50 insertions, 13 deletions

diff --git a/crates/proc_macro_srv/src/dylib.rs b/crates/proc_macro_srv/src/dylib.rs
index 4e719f3aa..28a6ee547 100644
--- a/crates/proc_macro_srv/src/dylib.rs
+++ b/crates/proc_macro_srv/src/dylib.rs
@@ -7,7 +7,7 @@ use std::{
 };
 
 use libloading::Library;
-use memmap::Mmap;
+use memmap2::Mmap;
 use object::Object;
 use proc_macro_api::ProcMacroKind;
 
@@ -60,7 +60,7 @@ fn find_registrar_symbol(file: &Path) -> io::Result<Option<String>> {
 /// It seems that on Windows that behaviour is default, so we do nothing in that case.
 #[cfg(windows)]
 fn load_library(file: &Path) -> Result<Library, libloading::Error> {
-    Library::new(file)
+    unsafe { Library::new(file) }
 }
 
 #[cfg(unix)]
@@ -71,7 +71,7 @@ fn load_library(file: &Path) -> Result<Library, libloading::Error> {
     const RTLD_NOW: c_int = 0x00002;
     const RTLD_DEEPBIND: c_int = 0x00008;
 
-    UnixLibrary::open(Some(file), RTLD_NOW | RTLD_DEEPBIND).map(|lib| lib.into())
+    unsafe { UnixLibrary::open(Some(file), RTLD_NOW | RTLD_DEEPBIND).map(|lib| lib.into()) }
 }
 
 struct ProcMacroLibraryLibloading {
diff --git a/crates/proc_macro_srv/src/rustc_server.rs b/crates/proc_macro_srv/src/rustc_server.rs
index e6006a3c8..952b4a97f 100644
--- a/crates/proc_macro_srv/src/rustc_server.rs
+++ b/crates/proc_macro_srv/src/rustc_server.rs
@@ -10,10 +10,10 @@
 
 use crate::proc_macro::bridge::{self, server};
 
-use std::collections::{Bound, HashMap};
+use std::collections::HashMap;
 use std::hash::Hash;
 use std::iter::FromIterator;
-use std::str::FromStr;
+use std::ops::Bound;
 use std::{ascii, vec::IntoIter};
 
 type Group = tt::Subtree;
@@ -277,6 +277,42 @@ impl server::FreeFunctions for Rustc {
     }
 }
 
+fn subtree_replace_token_ids_with_unspecified(subtree: tt::Subtree) -> tt::Subtree {
+    tt::Subtree {
+        delimiter: subtree.delimiter.map(|d| tt::Delimiter { id: tt::TokenId::unspecified(), ..d }),
+        token_trees: subtree
+            .token_trees
+            .into_iter()
+            .map(|t| token_tree_replace_token_ids_with_unspecified(t))
+            .collect(),
+    }
+}
+
+fn token_tree_replace_token_ids_with_unspecified(tt: tt::TokenTree) -> tt::TokenTree {
+    match tt {
+        tt::TokenTree::Leaf(leaf) => {
+            tt::TokenTree::Leaf(leaf_replace_token_ids_with_unspecified(leaf))
+        }
+        tt::TokenTree::Subtree(subtree) => {
+            tt::TokenTree::Subtree(subtree_replace_token_ids_with_unspecified(subtree))
+        }
+    }
+}
+
+fn leaf_replace_token_ids_with_unspecified(leaf: tt::Leaf) -> tt::Leaf {
+    match leaf {
+        tt::Leaf::Literal(lit) => {
+            tt::Leaf::Literal(tt::Literal { id: tt::TokenId::unspecified(), ..lit })
+        }
+        tt::Leaf::Punct(punct) => {
+            tt::Leaf::Punct(tt::Punct { id: tt::TokenId::unspecified(), ..punct })
+        }
+        tt::Leaf::Ident(ident) => {
+            tt::Leaf::Ident(tt::Ident { id: tt::TokenId::unspecified(), ..ident })
+        }
+    }
+}
+
 impl server::TokenStream for Rustc {
     fn new(&mut self) -> Self::TokenStream {
         Self::TokenStream::new()
@@ -286,7 +322,8 @@ impl server::TokenStream for Rustc {
         stream.is_empty()
     }
     fn from_str(&mut self, src: &str) -> Self::TokenStream {
-        Self::TokenStream::from_str(src).expect("cannot parse string")
+        let (subtree, _) = mbe::parse_to_token_tree(src).expect("cannot parse string");
+        TokenStream::with_subtree(subtree_replace_token_ids_with_unspecified(subtree))
     }
     fn to_string(&mut self, stream: &Self::TokenStream) -> String {
         stream.to_string()
@@ -505,8 +542,7 @@ impl server::Literal for Rustc {
             }
         }
 
-        let text =
-            def_suffixed_integer! {kind, u8, u16, u32, u64, u128, usize, i8, i16, i32, i64, i128};
+        let text = def_suffixed_integer! {kind, u8, u16, u32, u64, u128, usize, i8, i16, i32, i64, i128, isize};
 
         Literal { text: text.into(), id: tt::TokenId::unspecified() }
     }
diff --git a/crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt b/crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
index e6fd21610..ea34e688f 100644
--- a/crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
+++ b/crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
@@ -59,7 +59,7 @@ SUBTREE $
           IDENT   _serde 4294967295
           PUNCH   : [joint] 4294967295
           PUNCH   : [alone] 4294967295
-          IDENT   export 4294967295
+          IDENT   __private 4294967295
           PUNCH   : [joint] 4294967295
           PUNCH   : [alone] 4294967295
           IDENT   Ok 4294967295
@@ -72,7 +72,7 @@ SUBTREE $
           IDENT   _serde 4294967295
           PUNCH   : [joint] 4294967295
           PUNCH   : [alone] 4294967295
-          IDENT   export 4294967295
+          IDENT   __private 4294967295
           PUNCH   : [joint] 4294967295
           PUNCH   : [alone] 4294967295
           IDENT   Err 4294967295
@@ -85,7 +85,7 @@ SUBTREE $
             IDENT   _serde 4294967295
             PUNCH   : [joint] 4294967295
             PUNCH   : [alone] 4294967295
-            IDENT   export 4294967295
+            IDENT   __private 4294967295
             PUNCH   : [joint] 4294967295
             PUNCH   : [alone] 4294967295
             IDENT   Err 4294967295
@@ -120,7 +120,7 @@ SUBTREE $
       IDENT   _serde 4294967295
       PUNCH   : [joint] 4294967295
       PUNCH   : [alone] 4294967295
-      IDENT   export 4294967295
+      IDENT   __private 4294967295
       PUNCH   : [joint] 4294967295
       PUNCH   : [alone] 4294967295
       IDENT   Result 4294967295
diff --git a/crates/proc_macro_srv/src/tests/utils.rs b/crates/proc_macro_srv/src/tests/utils.rs
index 196abb8fc..22813052d 100644
--- a/crates/proc_macro_srv/src/tests/utils.rs
+++ b/crates/proc_macro_srv/src/tests/utils.rs
@@ -8,6 +8,7 @@ use test_utils::assert_eq_text;
 
 mod fixtures {
     use cargo_metadata::Message;
+    use std::path::PathBuf;
     use std::process::Command;
 
     // Use current project metadata to get the proc-macro dylib path
@@ -24,7 +25,7 @@ mod fixtures {
                     if artifact.target.kind.contains(&"proc-macro".to_string()) {
                         let repr = format!("{} {}", crate_name, version);
                         if artifact.package_id.repr.starts_with(&repr) {
-                            return artifact.filenames[0].clone();
+                            return PathBuf::from(&artifact.filenames[0]);
                         }
                     }
                 }