From 7ef7c353502dc7c8241f11f4a92e36c44007133b Mon Sep 17 00:00:00 2001 From: Remo Senekowitsch Date: Sun, 2 Oct 2022 12:43:52 +0200 Subject: [PATCH 1/2] Recommend rust-analyzer vscode extension --- .vscode/README.md | 4 ++-- .vscode/extensions.json | 4 ++-- .vscode/launch.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.vscode/README.md b/.vscode/README.md index 3b25b25..4d20f43 100644 --- a/.vscode/README.md +++ b/.vscode/README.md @@ -11,13 +11,13 @@ This directory contains configurations for two platforms: If you have the `code` command in your path, you can run the following commands to install the necessary extensions. ```sh -code --install-extension rust-lang.rust +code --install-extension rust-lang.rust-analyzer code --install-extension marus25.cortex-debug ``` Otherwise, you can use the Extensions view to search for and install them, or go directly to their marketplace pages and click the "Install" button. -- [Rust Language Server (RLS)](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust) +- [Rust Language Server (rust-analyzer)](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer) - [Cortex-Debug](https://marketplace.visualstudio.com/items?itemName=marus25.cortex-debug) ## Use diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 5a6574b..fdd83fa 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -4,11 +4,11 @@ // List of extensions which should be recommended for users of this workspace. "recommendations": [ - "rust-lang.rust", + "rust-lang.rust-analyzer", "marus25.cortex-debug", ], // List of extensions recommended by VS Code that should not be recommended for users of this workspace. "unwantedRecommendations": [ ] -} \ No newline at end of file +} diff --git a/.vscode/launch.json b/.vscode/launch.json index 4c950ba..33eb695 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,7 +1,7 @@ { /* - * Requires the Rust Language Server (RLS) and Cortex-Debug extensions - * https://marketplace.visualstudio.com/items?itemName=rust-lang.rust + * Requires the Rust Language Server (rust-analyzer) and Cortex-Debug extensions + * https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer * https://marketplace.visualstudio.com/items?itemName=marus25.cortex-debug */ "version": "0.2.0", From 62d6a84b52c21fea4b51b603aaa43d190267ff0e Mon Sep 17 00:00:00 2001 From: Remo Senekowitsch Date: Sun, 2 Oct 2022 16:45:22 +0200 Subject: [PATCH 2/2] Replace deprecated runToMain with runToEntryPoint --- .vscode/launch.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 33eb695..ee2ce00 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -13,7 +13,7 @@ "servertype": "qemu", "cwd": "${workspaceRoot}", "preLaunchTask": "Cargo Build (debug)", - "runToMain": true, + "runToEntryPoint": "main", "executable": "./target/thumbv7m-none-eabi/debug/{{project-name}}", /* Run `cargo build --example hello` and uncomment this line to run semi-hosting example */ //"executable": "./target/thumbv7m-none-eabi/debug/examples/hello", @@ -28,7 +28,7 @@ "servertype": "openocd", "cwd": "${workspaceRoot}", "preLaunchTask": "Cargo Build (debug)", - "runToMain": true, + "runToEntryPoint": "main", "executable": "./target/thumbv7em-none-eabihf/debug/{{project-name}}", /* Run `cargo build --example itm` and uncomment this line to run itm example */ // "executable": "./target/thumbv7em-none-eabihf/debug/examples/itm",