bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/proc-macro-srv-cli/tests/legacy_json.rs')
-rw-r--r--crates/proc-macro-srv-cli/tests/legacy_json.rs37
1 files changed, 17 insertions, 20 deletions
diff --git a/crates/proc-macro-srv-cli/tests/legacy_json.rs b/crates/proc-macro-srv-cli/tests/legacy_json.rs
index 8daee7b2bc..c0dbfd1679 100644
--- a/crates/proc-macro-srv-cli/tests/legacy_json.rs
+++ b/crates/proc-macro-srv-cli/tests/legacy_json.rs
@@ -9,7 +9,9 @@ mod common {
pub(crate) mod utils;
}
-use common::utils::{create_empty_token_tree, proc_macro_test_dylib_path, request, with_server};
+use common::utils::{
+ create_empty_token_tree, proc_macro_test_dylib_path, request_legacy, with_server,
+};
use expect_test::expect;
use proc_macro_api::{
ProtocolFormat::JsonLegacy,
@@ -23,7 +25,7 @@ use proc_macro_api::{
#[test]
fn test_version_check() {
with_server(JsonLegacy, |writer, reader| {
- let response = request(writer, reader, Request::ApiVersionCheck {}, None).into();
+ let response = request_legacy(writer, reader, Request::ApiVersionCheck {});
match response {
Response::ApiVersionCheck(version) => {
@@ -38,7 +40,7 @@ fn test_version_check() {
fn test_list_macros() {
with_server(JsonLegacy, |writer, reader| {
let dylib_path = proc_macro_test_dylib_path();
- let response = request(writer, reader, Request::ListMacros { dylib_path }, None).into();
+ let response = request_legacy(writer, reader, Request::ListMacros { dylib_path });
let Response::ListMacros(Ok(macros)) = response else {
panic!("expected successful ListMacros response");
@@ -73,13 +75,11 @@ fn test_list_macros() {
#[test]
fn test_list_macros_invalid_path() {
with_server(JsonLegacy, |writer, reader| {
- let response = request(
+ let response = request_legacy(
writer,
reader,
Request::ListMacros { dylib_path: "/nonexistent/path/to/dylib.so".into() },
- None,
- )
- .into();
+ );
match response {
Response::ListMacros(Err(e)) => assert!(
@@ -95,7 +95,7 @@ fn test_list_macros_invalid_path() {
fn test_set_config() {
with_server(JsonLegacy, |writer, reader| {
let config = ServerConfig { span_mode: SpanMode::Id };
- let response = request(writer, reader, Request::SetConfig(config), None).into();
+ let response = request_legacy(writer, reader, Request::SetConfig(config));
match response {
Response::SetConfig(returned_config) => {
@@ -110,7 +110,7 @@ fn test_set_config() {
fn test_set_config_rust_analyzer_mode() {
with_server(JsonLegacy, |writer, reader| {
let config = ServerConfig { span_mode: SpanMode::RustAnalyzer };
- let response = request(writer, reader, Request::SetConfig(config), None).into();
+ let response = request_legacy(writer, reader, Request::SetConfig(config));
match response {
Response::SetConfig(returned_config) => {
@@ -126,7 +126,7 @@ fn test_expand_macro_panic() {
with_server(JsonLegacy, |writer, reader| {
let dylib_path = proc_macro_test_dylib_path();
- let version_response = request(writer, reader, Request::ApiVersionCheck {}, None).into();
+ let version_response = request_legacy(writer, reader, Request::ApiVersionCheck {});
let Response::ApiVersionCheck(version) = version_response else {
panic!("expected version check response");
};
@@ -152,7 +152,7 @@ fn test_expand_macro_panic() {
},
}));
- let response = request(writer, reader, expand_request, None).into();
+ let response = request_legacy(writer, reader, expand_request);
match response {
Response::ExpandMacro(Err(PanicMessage(msg))) => {
@@ -171,21 +171,18 @@ fn test_basic_call_flow() {
with_server(JsonLegacy, |writer, reader| {
let dylib_path = proc_macro_test_dylib_path();
- let response1 = request(writer, reader, Request::ApiVersionCheck {}, None).into();
+ let response1 = request_legacy(writer, reader, Request::ApiVersionCheck {});
assert!(matches!(response1, Response::ApiVersionCheck(_)));
- let response2 = request(
+ let response2 = request_legacy(
writer,
reader,
Request::SetConfig(ServerConfig { span_mode: SpanMode::Id }),
- None,
- )
- .into();
+ );
assert!(matches!(response2, Response::SetConfig(_)));
let response3 =
- request(writer, reader, Request::ListMacros { dylib_path: dylib_path.clone() }, None)
- .into();
+ request_legacy(writer, reader, Request::ListMacros { dylib_path: dylib_path.clone() });
assert!(matches!(response3, Response::ListMacros(Ok(_))));
});
}
@@ -195,7 +192,7 @@ fn test_expand_nonexistent_macro() {
with_server(JsonLegacy, |writer, reader| {
let dylib_path = proc_macro_test_dylib_path();
- let version_response = request(writer, reader, Request::ApiVersionCheck {}, None).into();
+ let version_response = request_legacy(writer, reader, Request::ApiVersionCheck {});
let Response::ApiVersionCheck(version) = version_response else {
panic!("expected version check response");
};
@@ -221,7 +218,7 @@ fn test_expand_nonexistent_macro() {
},
}));
- let response = request(writer, reader, expand_request, None).into();
+ let response = request_legacy(writer, reader, expand_request);
match response {
Response::ExpandMacro(Err(PanicMessage(msg))) => {