2 files changed, 31 insertions, 18 deletions

diff --git a/editors/code/rust.tmGrammar.json b/editors/code/rust.tmGrammar.json
index 3ddd14f9c..18fad6288 100644
--- a/editors/code/rust.tmGrammar.json
+++ b/editors/code/rust.tmGrammar.json
@@ -694,23 +694,15 @@
         "interpolations": {
             "comment": "curly brace interpolations",
             "name": "meta.interpolation.rust",
-            "begin": "{",
-            "beginCaptures": {
-                "0": {
+            "match": "({)[^\"{}]*(})",
+            "captures": {
+                "1": {
                     "name": "punctuation.definition.interpolation.rust"
-                }
-            },
-            "end": "}",
-            "endCaptures": {
-                "0": {
+                },
+                "2": {
                     "name": "punctuation.definition.interpolation.rust"
                 }
-            },
-            "patterns": [
-                {
-                    "include": "#interpolations"
-                }
-            ]
+            }
         },
         "lifetimes": {
             "patterns": [
@@ -966,9 +958,28 @@
                     ]
                 },
                 {
-                    "comment": "double-quoted raw strings and raw byte strings",
+                    "comment": "double-quoted raw strings and raw byte strings (no hash)",
+                    "name": "string.quoted.double.rust",
+                    "begin": "(b?r)(\")",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "string.quoted.byte.raw.rust"
+                        },
+                        "2": {
+                            "name": "punctuation.definition.string.rust"
+                        }
+                    },
+                    "end": "\"",
+                    "endCaptures": {
+                        "0": {
+                            "name": "punctuation.definition.string.rust"
+                        }
+                    }
+                },
+                {
+                    "comment": "double-quoted raw strings and raw byte strings (with hash)",
                     "name": "string.quoted.double.rust",
-                    "begin": "(b?r)(#*)(\")",
+                    "begin": "(b?r)(#+)(\")",
                     "beginCaptures": {
                         "1": {
                             "name": "string.quoted.byte.raw.rust"
@@ -980,7 +991,7 @@
                             "name": "punctuation.definition.string.rust"
                         }
                     },
-                    "end": "(\")(#*)",
+                    "end": "(\")(#+)",
                     "endCaptures": {
                         "1": {
                             "name": "punctuation.definition.string.rust"
diff --git a/editors/code/src/run.ts b/editors/code/src/run.ts
index 459b7f250..17573cd82 100644
--- a/editors/code/src/run.ts
+++ b/editors/code/src/run.ts
@@ -129,7 +129,9 @@ export async function createTask(runnable: ra.Runnable, config: Config): Promise
     }
 
     const args = [...runnable.args.cargoArgs]; // should be a copy!
-    args.push(...runnable.args.cargoExtraArgs); // Append user-specified cargo options.
+    if (runnable.args.cargoExtraArgs) {
+        args.push(...runnable.args.cargoExtraArgs); // Append user-specified cargo options.
+    }
     if (runnable.args.executableArgs.length > 0) {
         args.push('--', ...runnable.args.executableArgs);
     }