Use stable toolchain for rust-analyzer on xtensa targets (#69)

* Use stable toolchain for rust-analyzer on xtensa targets

* Make rust-analyzer invoke cargo and rustc with esp toolchain on xtensa targets

* Update changelog

Author: lasernoises

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Verify the required options are provided (#65)
+- Use stable toolchain for rust-analyzer on xtensa targets (#69)
 - Added missing template substitution in devcontainer.json (#70)
 
 ### Removed

template/.helix/languages.toml

@@ -2,7 +2,16 @@
 [[language]]
 name = "rust"
 
+#IF option("xtensa")
+[language-server.rust-analyzer]
+environment.RUSTUP_TOOLCHAIN = "stable"
+
+#ENDIF
 [language-server.rust-analyzer.config]
 check.allTargets = false
 #REPLACE riscv32imac-unknown-none-elf rust_target
 cargo.target = "riscv32imac-unknown-none-elf"
+#IF option("xtensa")
+check.extraEnv.RUSTUP_TOOLCHAIN = "esp"
+cargo.extraEnv.RUSTUP_TOOLCHAIN = "esp"
+#ENDIF

template/.vscode/settings.json

@@ -1,6 +1,17 @@
 //INCLUDEFILE vscode
 {
-    "rust-analyzer.cargo.allTargets": false,
-    //REPLACE riscv32imac-unknown-none-elf rust_target
-    "rust-analyzer.cargo.target": "riscv32imac-unknown-none-elf",
-}
+  "rust-analyzer.cargo.allTargets": false,
+  //REPLACE riscv32imac-unknown-none-elf rust_target
+  "rust-analyzer.cargo.target": "riscv32imac-unknown-none-elf",
+  //IF option("xtensa")
+  "rust-analyzer.server.extraEnv": {
+    "RUSTUP_TOOLCHAIN": "stable"
+  },
+  "rust-analyzer.check.extraEnv": {
+    "RUSTUP_TOOLCHAIN": "esp"
+  },
+  "rust-analyzer.cargo.extraEnv": {
+    "RUSTUP_TOOLCHAIN": "esp"
+  },
+  //ENDIF
+}