diff --git a/crates/proc_macro_srv/src/abis/abi_1_47/mod.rs b/crates/proc_macro_srv/src/abis/abi_1_48/mod.rs similarity index 100% rename from crates/proc_macro_srv/src/abis/abi_1_47/mod.rs rename to crates/proc_macro_srv/src/abis/abi_1_48/mod.rs diff --git a/crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/buffer.rs b/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/buffer.rs similarity index 100% rename from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/buffer.rs rename to crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/buffer.rs diff --git a/crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/client.rs b/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/client.rs similarity index 100% rename from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/client.rs rename to crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/client.rs diff --git a/crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/closure.rs b/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/closure.rs similarity index 100% rename from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/closure.rs rename to crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/closure.rs diff --git a/crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/handle.rs b/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/handle.rs similarity index 100% rename from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/handle.rs rename to crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/handle.rs diff --git a/crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/mod.rs b/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/mod.rs similarity index 100% rename from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/mod.rs rename to crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/mod.rs diff --git a/crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/rpc.rs b/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/rpc.rs similarity index 100% rename from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/rpc.rs rename to crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/rpc.rs diff --git a/crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/scoped_cell.rs b/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/scoped_cell.rs similarity index 100% rename from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/scoped_cell.rs rename to crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/scoped_cell.rs diff --git a/crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/server.rs b/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/server.rs similarity index 100% rename from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/server.rs rename to crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/server.rs diff --git a/crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/diagnostic.rs b/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/diagnostic.rs similarity index 100% rename from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/diagnostic.rs rename to crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/diagnostic.rs diff --git a/crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/mod.rs b/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/mod.rs similarity index 100% rename from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/mod.rs rename to crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/mod.rs diff --git a/crates/proc_macro_srv/src/abis/abi_1_47/rustc_server.rs b/crates/proc_macro_srv/src/abis/abi_1_48/rustc_server.rs similarity index 100% rename from crates/proc_macro_srv/src/abis/abi_1_47/rustc_server.rs rename to crates/proc_macro_srv/src/abis/abi_1_48/rustc_server.rs diff --git a/crates/proc_macro_srv/src/abis/mod.rs b/crates/proc_macro_srv/src/abis/mod.rs index 3cade0aa47..87fca8caab 100644 --- a/crates/proc_macro_srv/src/abis/mod.rs +++ b/crates/proc_macro_srv/src/abis/mod.rs @@ -24,14 +24,14 @@ //! // pub(crate) so tests can use the TokenStream, more notes in test/utils.rs -pub(crate) mod abi_1_47; +pub(crate) mod abi_1_48; mod abi_1_54; mod abi_1_56; mod abi_1_57; mod abi_1_58; use super::dylib::LoadProcMacroDylibError; -pub(crate) use abi_1_47::Abi as Abi_1_47; +pub(crate) use abi_1_48::Abi as Abi_1_48; pub(crate) use abi_1_54::Abi as Abi_1_54; pub(crate) use abi_1_56::Abi as Abi_1_56; pub(crate) use abi_1_57::Abi as Abi_1_57; @@ -50,7 +50,7 @@ impl PanicMessage { } pub(crate) enum Abi { - Abi1_47(Abi_1_47), + Abi1_48(Abi_1_48), Abi1_54(Abi_1_54), Abi1_56(Abi_1_56), Abi1_57(Abi_1_57), @@ -75,9 +75,9 @@ impl Abi { // FIXME: this should use exclusive ranges when they're stable // https://github.com/rust-lang/rust/issues/37854 match (info.version.0, info.version.1) { - (1, 47..=53) => { - let inner = unsafe { Abi_1_47::from_lib(lib, symbol_name) }?; - Ok(Abi::Abi1_47(inner)) + (1, 48..=53) => { + let inner = unsafe { Abi_1_48::from_lib(lib, symbol_name) }?; + Ok(Abi::Abi1_48(inner)) } (1, 54..=55) => { let inner = unsafe { Abi_1_54::from_lib(lib, symbol_name) }?; @@ -106,7 +106,7 @@ impl Abi { attributes: Option<&tt::Subtree>, ) -> Result { match self { - Self::Abi1_47(abi) => abi.expand(macro_name, macro_body, attributes), + Self::Abi1_48(abi) => abi.expand(macro_name, macro_body, attributes), Self::Abi1_54(abi) => abi.expand(macro_name, macro_body, attributes), Self::Abi1_56(abi) => abi.expand(macro_name, macro_body, attributes), Self::Abi1_57(abi) => abi.expand(macro_name, macro_body, attributes), @@ -116,7 +116,7 @@ impl Abi { pub fn list_macros(&self) -> Vec<(String, ProcMacroKind)> { match self { - Self::Abi1_47(abi) => abi.list_macros(), + Self::Abi1_48(abi) => abi.list_macros(), Self::Abi1_54(abi) => abi.list_macros(), Self::Abi1_56(abi) => abi.list_macros(), Self::Abi1_57(abi) => abi.list_macros(), diff --git a/crates/proc_macro_srv/src/tests/utils.rs b/crates/proc_macro_srv/src/tests/utils.rs index f8cbf70b61..d1f492ee8f 100644 --- a/crates/proc_macro_srv/src/tests/utils.rs +++ b/crates/proc_macro_srv/src/tests/utils.rs @@ -11,14 +11,14 @@ pub mod fixtures { } } -fn parse_string(code: &str) -> Option { +fn parse_string(code: &str) -> Option { // This is a bit strange. We need to parse a string into a token stream into // order to create a tt::SubTree from it in fixtures. `into_subtree` is // implemented by all the ABIs we have so we arbitrarily choose one ABI to // write a `parse_string` function for and use that. The tests don't really // care which ABI we're using as the `into_subtree` function isn't part of // the ABI and shouldn't change between ABI versions. - crate::abis::abi_1_47::TokenStream::from_str(code).ok() + crate::abis::abi_1_48::TokenStream::from_str(code).ok() } pub fn assert_expand(macro_name: &str, ra_fixture: &str, expect: Expect) {