Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 21:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #3083 #3101

Browse source 
3083: Update some crates r=matklad a=kjeremy



3101: vscode: filter out arm linux from using prebuilt binaries r=matklad a=Veetaha

Closes #3076

Co-authored-by: kjeremy <kjeremy@gmail.com>
Co-authored-by: Veetaha <gerzoh1@gmail.com>
This commit is contained in:
bors[bot] 2020-02-11 09:32:32 +00:00 committed by GitHub
commit f55d74dc0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Cargo.lock generated
View file

@ -110,9 +110,9 @@ dependencies = [
[[package]] [[package]]
name = "byteorder" name = "byteorder"
version = "1.3.2" version = "1.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
[[package]] [[package]]
name = "c2-chacha" name = "c2-chacha"
@ -1563,12 +1563,9 @@ checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
[[package]] [[package]]
name = "rustc-hash" name = "rustc-hash"
version = "1.0.1" version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
dependencies = [
"byteorder",
]
[[package]] [[package]]
name = "rustc_lexer" name = "rustc_lexer"
@ -1675,9 +1672,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_json" name = "serde_json"
version = "1.0.46" version = "1.0.47"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21b01d7f0288608a01dca632cf1df859df6fd6ffa885300fc275ce2ba6221953" checksum = "15913895b61e0be854afd32fd4163fcd2a3df34142cf2cb961b310ce694cbf90"
dependencies = [ dependencies = [
"itoa", "itoa",
"ryu", "ryu",

23
editors/code/src/config.ts
View file

@ -64,9 +64,24 @@ export class Config {
* `platform` on GitHub releases. (It is also stored under the same name when * `platform` on GitHub releases. (It is also stored under the same name when
* downloaded by the extension). * downloaded by the extension).
*/ */
private static prebuiltLangServerFileName(platform: NodeJS.Platform): null | string { private static prebuiltLangServerFileName(
platform: NodeJS.Platform,
arch: string
): null | string {
// See possible `arch` values here:
// https://nodejs.org/api/process.html#process_process_arch
switch (platform) { switch (platform) {
case "linux": return "ra_lsp_server-linux";
case "linux": {
switch (arch) {
case "arm":
case "arm64": return null;
default: return "ra_lsp_server-linux";
}
}
case "darwin": return "ra_lsp_server-mac"; case "darwin": return "ra_lsp_server-mac";
case "win32": return "ra_lsp_server-windows.exe"; case "win32": return "ra_lsp_server-windows.exe";
@ -95,7 +110,9 @@ export class Config {
}; };
} }
const prebuiltBinaryName = Config.prebuiltLangServerFileName(process.platform); const prebuiltBinaryName = Config.prebuiltLangServerFileName(
process.platform, process.arch
);
if (!prebuiltBinaryName) return null; if (!prebuiltBinaryName) return null;