Skip to content

Rename and use the 1.55 ABI for 1.54 #11187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 4, 2022
Merged

Rename and use the 1.55 ABI for 1.54 #11187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...s/proc_macro_srv/src/abis/abi_1_55/mod.rs → ...s/proc_macro_srv/src/abis/abi_1_54/mod.rs
View file
Open in desktop
File renamed without changes.
0 ...abis/abi_1_55/proc_macro/bridge/buffer.rs → ...abis/abi_1_54/proc_macro/bridge/buffer.rs
View file
Open in desktop
File renamed without changes.
0 ...abis/abi_1_55/proc_macro/bridge/client.rs → ...abis/abi_1_54/proc_macro/bridge/client.rs
View file
Open in desktop
File renamed without changes.
0 ...bis/abi_1_55/proc_macro/bridge/closure.rs → ...bis/abi_1_54/proc_macro/bridge/closure.rs
View file
Open in desktop
File renamed without changes.
0 ...abis/abi_1_55/proc_macro/bridge/handle.rs → ...abis/abi_1_54/proc_macro/bridge/handle.rs
View file
Open in desktop
File renamed without changes.
0 ...rc/abis/abi_1_55/proc_macro/bridge/mod.rs → ...rc/abis/abi_1_54/proc_macro/bridge/mod.rs
View file
Open in desktop
File renamed without changes.
0 ...rc/abis/abi_1_55/proc_macro/bridge/rpc.rs → ...rc/abis/abi_1_54/proc_macro/bridge/rpc.rs
View file
Open in desktop
File renamed without changes.
0 ...abi_1_55/proc_macro/bridge/scoped_cell.rs → ...abi_1_54/proc_macro/bridge/scoped_cell.rs
View file
Open in desktop
File renamed without changes.
0 ...abis/abi_1_55/proc_macro/bridge/server.rs → ...abis/abi_1_54/proc_macro/bridge/server.rs
View file
Open in desktop
File renamed without changes.
0 ...rc/abis/abi_1_55/proc_macro/diagnostic.rs → ...rc/abis/abi_1_54/proc_macro/diagnostic.rs
View file
Open in desktop
File renamed without changes.
0 ...o_srv/src/abis/abi_1_55/proc_macro/mod.rs → ...o_srv/src/abis/abi_1_54/proc_macro/mod.rs
View file
Open in desktop
File renamed without changes.
0 ...cro_srv/src/abis/abi_1_55/rustc_server.rs → ...cro_srv/src/abis/abi_1_54/rustc_server.rs
View file
Open in desktop
File renamed without changes.
18 changes: 9 additions & 9 deletions crates/proc_macro_srv/src/abis/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@

// pub(crate) so tests can use the TokenStream, more notes in test/utils.rs
pub(crate) mod abi_1_47;
mod abi_1_55;
mod abi_1_54;
mod abi_1_56;
mod abi_1_58;

use super::dylib::LoadProcMacroDylibError;
pub(crate) use abi_1_47::Abi as Abi_1_47;
pub(crate) use abi_1_55::Abi as Abi_1_55;
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_58::Abi as Abi_1_58;
use libloading::Library;
Expand All @@ -49,7 +49,7 @@ impl PanicMessage {

pub(crate) enum Abi {
Abi1_47(Abi_1_47),
Abi1_55(Abi_1_55),
Abi1_54(Abi_1_54),
Abi1_56(Abi_1_56),
Abi1_58(Abi_1_58),
}
Expand All @@ -72,13 +72,13 @@ 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..=54) => {
(1, 47..=53) => {
let inner = unsafe { Abi_1_47::from_lib(lib, symbol_name) }?;
Ok(Abi::Abi1_47(inner))
}
(1, 55..=55) => {
let inner = unsafe { Abi_1_55::from_lib(lib, symbol_name) }?;
Ok(Abi::Abi1_55(inner))
(1, 54..=55) => {
let inner = unsafe { Abi_1_54::from_lib(lib, symbol_name) }?;
Ok(Abi::Abi1_54(inner))
}
(1, 56..=57) => {
let inner = unsafe { Abi_1_56::from_lib(lib, symbol_name) }?;
Expand All @@ -99,8 +99,8 @@ impl Abi {
attributes: Option<&tt::Subtree>,
) -> Result<tt::Subtree, PanicMessage> {
match self {
Self::Abi1_55(abi) => abi.expand(macro_name, macro_body, attributes),
Self::Abi1_47(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_58(abi) => abi.expand(macro_name, macro_body, attributes),
}
Expand All @@ -109,7 +109,7 @@ impl Abi {
pub fn list_macros(&self) -> Vec<(String, ProcMacroKind)> {
match self {
Self::Abi1_47(abi) => abi.list_macros(),
Self::Abi1_55(abi) => abi.list_macros(),
Self::Abi1_54(abi) => abi.list_macros(),
Self::Abi1_56(abi) => abi.list_macros(),
Self::Abi1_58(abi) => abi.list_macros(),
}
Expand Down