refactor: Rename CargoRunnable to CargoRunnableArgs

rust-lang · Mar 27, 2024 · 5cd677c · 5cd677c
1 parent 3746eb2
commit 5cd677c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/crates/rust-analyzer/src/handlers/request.rs b/crates/rust-analyzer/src/handlers/request.rs
@@ -851,7 +851,7 @@ pub(crate) fn handle_runnables(
                     ),
                     location: None,
                     kind: lsp_ext::RunnableKind::Cargo,
-                    args: lsp_ext::CargoRunnable {
+                    args: lsp_ext::CargoRunnableArgs {
                         workspace_root: Some(spec.workspace_root.clone().into()),
                         override_cargo: config.override_cargo.clone(),
                         cargo_args,
@@ -868,7 +868,7 @@ pub(crate) fn handle_runnables(
                     label: "cargo check --workspace".to_owned(),
                     location: None,
                     kind: lsp_ext::RunnableKind::Cargo,
-                    args: lsp_ext::CargoRunnable {
+                    args: lsp_ext::CargoRunnableArgs {
                         workspace_root: None,
                         override_cargo: config.override_cargo,
                         cargo_args: vec!["check".to_owned(), "--workspace".to_owned()],

diff --git a/crates/rust-analyzer/src/lsp/ext.rs b/crates/rust-analyzer/src/lsp/ext.rs
@@ -423,7 +423,7 @@ pub struct Runnable {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub location: Option<lsp_types::LocationLink>,
     pub kind: RunnableKind,
-    pub args: CargoRunnable,
+    pub args: CargoRunnableArgs,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -434,7 +434,7 @@ pub enum RunnableKind {
 
 #[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
-pub struct CargoRunnable {
+pub struct CargoRunnableArgs {
     // command to be executed instead of cargo
     pub override_cargo: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]

diff --git a/crates/rust-analyzer/src/lsp/to_proto.rs b/crates/rust-analyzer/src/lsp/to_proto.rs
@@ -1364,7 +1364,7 @@ pub(crate) fn runnable(
                 label,
                 location: Some(location),
                 kind: lsp_ext::RunnableKind::Cargo,
-                args: lsp_ext::CargoRunnable {
+                args: lsp_ext::CargoRunnableArgs {
                     workspace_root: Some(workspace_root.into()),
                     override_cargo: config.override_cargo,
                     cargo_args,
@@ -1384,7 +1384,7 @@ pub(crate) fn runnable(
                 label,
                 location: Some(location),
                 kind: lsp_ext::RunnableKind::Cargo,
-                args: lsp_ext::CargoRunnable {
+                args: lsp_ext::CargoRunnableArgs {
                     workspace_root: None,
                     override_cargo: config.override_cargo,
                     cargo_args,