Merge #11187

11187: Rename and use the 1.55 ABI for 1.54 r=lnicola a=lnicola

It seems that what we used to call the 1.55 ABI was actually introduced in 1.54.

CC #10799

Thanks to `@danielframpton` for finding it.

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>

13 files changed, 9 insertions, 9 deletions

diff --git a/crates/proc_macro_srv/src/abis/abi_1_55/mod.rs b/crates/proc_macro_srv/src/abis/abi_1_54/mod.rs
index 81c55cf10c7..81c55cf10c7 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_55/mod.rs
+++ b/crates/proc_macro_srv/src/abis/abi_1_54/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/bridge/buffer.rs b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/buffer.rs
index 1565db187c6..1565db187c6 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/bridge/buffer.rs
+++ b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/buffer.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/bridge/client.rs b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/client.rs
index 9f74fb06689..9f74fb06689 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/bridge/client.rs
+++ b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/client.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/bridge/closure.rs b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/closure.rs
index f5b6d897e43..f5b6d897e43 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/bridge/closure.rs
+++ b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/closure.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/bridge/handle.rs b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/handle.rs
index d2a65d249b5..d2a65d249b5 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/bridge/handle.rs
+++ b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/handle.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/bridge/mod.rs b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/mod.rs
index 8d97bddfd38..8d97bddfd38 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/bridge/mod.rs
+++ b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/bridge/rpc.rs b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/rpc.rs
index 69928ec845a..69928ec845a 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/bridge/rpc.rs
+++ b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/rpc.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/bridge/scoped_cell.rs b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/scoped_cell.rs
index 0436bc41836..0436bc41836 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/bridge/scoped_cell.rs
+++ b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/scoped_cell.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/bridge/server.rs b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/server.rs
index 21563fe6049..21563fe6049 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/bridge/server.rs
+++ b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/server.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/diagnostic.rs b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/diagnostic.rs
index 6953b1ecf4c..6953b1ecf4c 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/diagnostic.rs
+++ b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/diagnostic.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/mod.rs b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/mod.rs
index 5814267cfc5..5814267cfc5 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_55/proc_macro/mod.rs
+++ b/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_55/rustc_server.rs b/crates/proc_macro_srv/src/abis/abi_1_54/rustc_server.rs
index 6105238d0b2..6105238d0b2 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_55/rustc_server.rs
+++ b/crates/proc_macro_srv/src/abis/abi_1_54/rustc_server.rs
diff --git a/crates/proc_macro_srv/src/abis/mod.rs b/crates/proc_macro_srv/src/abis/mod.rs
index 0de15b48329..c78e88dcb8d 100644
--- a/crates/proc_macro_srv/src/abis/mod.rs
+++ b/crates/proc_macro_srv/src/abis/mod.rs
@@ -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;
@@ -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),
 }
@@ -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) }?;
@@ -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),
         }
@@ -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(),
         }