Merge #3083 #3101

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 <[email protected]> Co-authored-by: Veetaha <[email protected]>
rust-lang · Feb 11, 2020 · f55d74d · f55d74d
3 parents 98aa709 + f51e3a3 + 2344dac
commit f55d74d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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;