Skip to content

Commit 18bb680

Browse files
authored
Merge pull request #100 from rubberduck203/master
Fixes #99: Disambiguates VSCode Tasks
2 parents 3cbcb99 + eb68e8b commit 18bb680

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.vscode/launch.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"name": "Debug (QEMU)",
1313
"servertype": "qemu",
1414
"cwd": "${workspaceRoot}",
15-
"preLaunchTask": "cargo build",
15+
"preLaunchTask": "Cargo Build (debug)",
1616
"runToMain": true,
1717
"executable": "./target/thumbv7m-none-eabi/debug/{{project-name}}",
1818
/* Run `cargo build --example hello` and uncomment this line to run semi-hosting example */
@@ -27,7 +27,7 @@
2727
"name": "Debug (OpenOCD)",
2828
"servertype": "openocd",
2929
"cwd": "${workspaceRoot}",
30-
"preLaunchTask": "cargo build",
30+
"preLaunchTask": "Cargo Build (debug)",
3131
"runToMain": true,
3232
"executable": "./target/thumbv7em-none-eabihf/debug/{{project-name}}",
3333
/* Run `cargo build --example itm` and uncomment this line to run itm example */

.vscode/tasks.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* but we need to provide a label for it,
1010
* so we can invoke it from the debug launcher.
1111
*/
12-
"label": "cargo build",
12+
"label": "Cargo Build (debug)",
1313
"type": "process",
1414
"command": "cargo",
1515
"args": ["build"],
@@ -22,7 +22,7 @@
2222
}
2323
},
2424
{
25-
"label": "cargo build --release",
25+
"label": "Cargo Build (release)",
2626
"type": "process",
2727
"command": "cargo",
2828
"args": ["build", "--release"],
@@ -32,7 +32,7 @@
3232
"group": "build"
3333
},
3434
{
35-
"label": "cargo build --examples",
35+
"label": "Cargo Build Examples (debug)",
3636
"type": "process",
3737
"command": "cargo",
3838
"args": ["build","--examples"],
@@ -42,7 +42,7 @@
4242
"group": "build"
4343
},
4444
{
45-
"label": "cargo build --examples --release",
45+
"label": "Cargo Build Examples (release)",
4646
"type": "process",
4747
"command": "cargo",
4848
"args": ["build","--examples", "--release"],
@@ -52,7 +52,7 @@
5252
"group": "build"
5353
},
5454
{
55-
"label": "cargo clean",
55+
"label": "Cargo Clean",
5656
"type": "process",
5757
"command": "cargo",
5858
"args": ["clean"],

0 commit comments

Comments
 (0)