fix(embedded): Don't generate package names with invalid leading digit

Author: epage

src/cargo/util/restricted_names.rs

@@ -87,17 +87,13 @@ pub fn validate_package_name(name: &str, what: &str, help: &str) -> CargoResult<
 pub fn sanitize_package_name(name: &str, placeholder: char) -> String {
     let mut slug = String::new();
     let mut chars = name.chars();
-    if let Some(ch) = chars.next() {
-        if ch.is_digit(10) {
-            slug.push(placeholder);
-            slug.push(ch);
-        } else if unicode_xid::UnicodeXID::is_xid_start(ch) || ch == '_' {
+    while let Some(ch) = chars.next() {
+        if (unicode_xid::UnicodeXID::is_xid_start(ch) || ch == '_') && !ch.is_digit(10) {
             slug.push(ch);
-        } else {
-            slug.push(placeholder);
+            break;
         }
     }
-    for ch in chars {
+    while let Some(ch) = chars.next() {
         if unicode_xid::UnicodeXID::is_xid_continue(ch) || ch == '-' {
             slug.push(ch);
         } else {

tests/testsuite/script.rs

@@ -552,13 +552,16 @@ fn test_name_has_leading_number() {
 
     p.cargo("-Zscript -v 42answer.rs")
         .masquerade_as_nightly_cargo(&["script"])
-        .with_status(101)
+        .with_stdout(
+            r#"bin: [..]/debug/answer[EXE]
+args: []
+"#,
+        )
         .with_stderr(
             r#"[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
-[ERROR] failed to parse manifest at `[ROOT]/foo/42answer.rs`
-
-Caused by:
-  invalid character `-` in package name: `-42answer`, the first character must be a Unicode XID start character (most letters or `_`)
+[COMPILING] answer v0.0.0 ([ROOT]/foo)
+[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
+[RUNNING] `[..]/debug/answer[EXE]`
 "#,
         )
         .run();
@@ -577,7 +580,7 @@ fn test_name_is_number() {
 [ERROR] failed to parse manifest at `[ROOT]/foo/42.rs`
 
 Caused by:
-  invalid character `-` in package name: `-42`, the first character must be a Unicode XID start character (most letters or `_`)
+  package name cannot be an empty string
 "#,
         )
         .run();