From f51e3a357e3f809ac25e0e53948cdbc6c0a7c60f Mon Sep 17 00:00:00 2001 From: kjeremy Date: Mon, 10 Feb 2020 10:42:56 -0500 Subject: [PATCH 1/2] Update some crates --- Cargo.lock | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e29ff898d71..847653696d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -110,9 +110,9 @@ dependencies = [ [[package]] name = "byteorder" -version = "1.3.2" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" [[package]] name = "c2-chacha" @@ -1563,12 +1563,9 @@ checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" [[package]] name = "rustc-hash" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" -dependencies = [ - "byteorder", -] +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_lexer" @@ -1675,9 +1672,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.46" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b01d7f0288608a01dca632cf1df859df6fd6ffa885300fc275ce2ba6221953" +checksum = "15913895b61e0be854afd32fd4163fcd2a3df34142cf2cb961b310ce694cbf90" dependencies = [ "itoa", "ryu", From 2344dac183cf95c6d1ac9104fa5e55af38534402 Mon Sep 17 00:00:00 2001 From: Veetaha Date: Tue, 11 Feb 2020 02:29:11 +0200 Subject: [PATCH 2/2] vscode: filter out arm linux from using prebuilt binaries --- editors/code/src/config.ts | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts index d5f3da2ed85..41884543684 100644 --- a/editors/code/src/config.ts +++ b/editors/code/src/config.ts @@ -64,9 +64,24 @@ export class Config { * `platform` on GitHub releases. (It is also stored under the same name when * 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) { - 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 "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;