bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Merge #11810
11810: internal: rename the 1.47 proc macro ABI to 1.48 r=jonas-schievink a=jonas-schievink Closes https://github.com/rust-analyzer/rust-analyzer/issues/9898. We don't support 1.47, so rename it to reflect that. bors r+ Co-authored-by: Jonas Schievink <[email protected]>
Browse Source
bors[bot] 2022-03-25
parent f3d1a53 · parent ea0325b · commit d64f455
Diffstat
-rw-r--r--crates/proc_macro_srv/src/abis/abi_1_48/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_47/mod.rs)0
-rw-r--r--crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/buffer.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/buffer.rs)0
-rw-r--r--crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/client.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/client.rs)0
-rw-r--r--crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/closure.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/closure.rs)0
-rw-r--r--crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/handle.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/handle.rs)0
-rw-r--r--crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/mod.rs)0
-rw-r--r--crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/rpc.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/rpc.rs)0
-rw-r--r--crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/scoped_cell.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/scoped_cell.rs)0
-rw-r--r--crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/server.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/bridge/server.rs)0
-rw-r--r--crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/diagnostic.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/diagnostic.rs)0
-rw-r--r--crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_47/proc_macro/mod.rs)0
-rw-r--r--crates/proc_macro_srv/src/abis/abi_1_48/rustc_server.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_47/rustc_server.rs)0
-rw-r--r--crates/proc_macro_srv/src/abis/mod.rs16
-rw-r--r--crates/proc_macro_srv/src/tests/utils.rs4
14 files changed, 10 insertions, 10 deletions
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
index b944143a07..b944143a07 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_47/mod.rs
+++ b/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
index 3b2afe01f5..3b2afe01f5 100644
--- 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
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
index 9f74fb0668..9f74fb0668 100644
--- 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
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
index f5b6d897e4..f5b6d897e4 100644
--- 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
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
index d2a65d249b..d2a65d249b 100644
--- 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
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
index be5402d6ee..be5402d6ee 100644
--- 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
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
index 69928ec845..69928ec845 100644
--- 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
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
index 0436bc4183..0436bc4183 100644
--- 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
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
index a580419fd1..a580419fd1 100644
--- 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
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
index 6953b1ecf4..6953b1ecf4 100644
--- 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
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
index aaa7103756..aaa7103756 100644
--- 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
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
index 4dc506e0f1..4dc506e0f1 100644
--- 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
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<tt::Subtree, PanicMessage> {
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<crate::abis::abi_1_47::TokenStream> {
+fn parse_string(code: &str) -> Option<crate::abis::abi_1_48::TokenStream> {
// 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) {