From 5236290c24bcc359a7483906df9adbf2dac30f1a Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Tue, 24 Oct 2023 09:43:50 +0100 Subject: [PATCH] lsp-rust: Change rust-analyzer URL for new home at rust-lang (#4200) Github now redirects https://github.com/rust-analyzer/rust-analyzer to https://github.com/rust-lang/rust-analyzer Update the URLs in lsp-rust, otherwise server updates no longer work. --- CHANGELOG.org | 1 + clients/lsp-rust.el | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index eef1415f6b1..3d184b9729c 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -1,5 +1,6 @@ * Changelog ** Unreleased 8.0.1 + * Change rust-analyzer base URL to be github.com/rust-lang/rust-analyzer, rather than rust-analyzer/rust-analyzer. * Add [[https://github.com/wader/jq-lsp][jq-lsp]] * Add architecture triples for [[https://github.com/WhatsApp/erlang-language-platform][erlang-language-platform]] file downloads, to support macos on ARM and X86. * Add semantic token support for [[https://github.com/WhatsApp/erlang-language-platform][erlang-language-platform]] in lsp-erlang client. diff --git a/clients/lsp-rust.el b/clients/lsp-rust.el index c0f99acde0b..23a47faff26 100644 --- a/clients/lsp-rust.el +++ b/clients/lsp-rust.el @@ -44,13 +44,13 @@ (defgroup lsp-rust-analyzer nil "LSP support for Rust, using rust-analyzer." :group 'lsp-mode - :link '(url-link "https://github.com/rust-analyzer/rust-analyzer") + :link '(url-link "https://github.com/rust-lang/rust-analyzer") :package-version '(lsp-mode . "8.0.0")) (defgroup lsp-rust-analyzer-semantic-tokens nil "LSP semantic tokens support for rust-analyzer." :group 'lsp-rust-analyzer - :link '(url-link "https://github.com/rust-analyzer/rust-analyzer") + :link '(url-link "https://github.com/rust-lang/rust-analyzer") :package-version '(lsp-mode . "8.0.1")) (defcustom lsp-rust-server 'rust-analyzer @@ -904,7 +904,7 @@ or JSON objects in `rust-project.json` format." (lsp-send-request (lsp-make-request "rust-analyzer/reloadWorkspace"))) (defcustom lsp-rust-analyzer-download-url - (format "https://github.com/rust-analyzer/rust-analyzer/releases/latest/download/%s" + (format "https://github.com/rust-lang/rust-analyzer/releases/latest/download/%s" (pcase system-type ('gnu/linux "rust-analyzer-x86_64-unknown-linux-gnu.gz") ('darwin (if (string-match "^aarch64-.*" system-configuration) @@ -1549,7 +1549,7 @@ and run a compilation" "Open the closest Cargo.toml from the current file. Rust-Analyzer LSP protocol documented here and added in November 2020 -https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/dev/lsp-extensions.md#open-cargotoml +https://github.com/rust-lang/rust-analyzer/blob/master/docs/dev/lsp-extensions.md#open-cargotoml If NEW-WINDOW (interactively the prefix argument) is non-nil, open in a new window." @@ -1570,7 +1570,7 @@ open in a new window." "Open a URL for documentation related to the current TextDocumentPosition. Rust-Analyzer LSP protocol documented here -https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/dev/lsp-extensions.md#open-external-documentation" +https://github.com/rust-lang/rust-analyzer/blob/master/docs/dev/lsp-extensions.md#open-external-documentation" (interactive) (-if-let* ((params (lsp-make-rust-analyzer-open-external-docs-params :text-document (lsp--text-document-identifier) @@ -1607,7 +1607,7 @@ the `lsp-rust-analyzer--last-runnable' variable." "Execute a RUNNABLE test related to the current document position. Rust-Analyzer LSP protocol extension -https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/dev/lsp-extensions.md#related-tests" +https://github.com/rust-lang/rust-analyzer/blob/master/docs/dev/lsp-extensions.md#related-tests" (interactive (list (lsp-rust-analyzer--select-related-test))) (if runnable (lsp-rust-analyzer--common-runner runnable)