Skip to content

Commit

Permalink
lsp-rust: Change rust-analyzer URL for new home at rust-lang (#4200)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
alanz authored Oct 24, 2023
1 parent 912d446 commit 5236290
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.org
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
12 changes: 6 additions & 6 deletions clients/lsp-rust.el
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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."
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 5236290

Please sign in to comment.