From 7d4e39c4f58391421a905d257c11cc85bbf9458c Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 11 Jul 2023 14:37:44 -0500 Subject: [PATCH] fix(embedded): Don't generate empty package names --- src/cargo/util/restricted_names.rs | 3 +++ tests/testsuite/script.rs | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/cargo/util/restricted_names.rs b/src/cargo/util/restricted_names.rs index 8f83674dd..2c3eaa9e1 100644 --- a/src/cargo/util/restricted_names.rs +++ b/src/cargo/util/restricted_names.rs @@ -100,6 +100,9 @@ pub fn sanitize_package_name(name: &str, placeholder: char) -> String { slug.push(placeholder); } } + if slug.is_empty() { + slug.push_str("package"); + } slug } diff --git a/tests/testsuite/script.rs b/tests/testsuite/script.rs index bb672fc0d..ab758498b 100644 --- a/tests/testsuite/script.rs +++ b/tests/testsuite/script.rs @@ -574,13 +574,16 @@ fn test_name_is_number() { p.cargo("-Zscript -v 42.rs") .masquerade_as_nightly_cargo(&["script"]) - .with_status(101) + .with_stdout( + r#"bin: [..]/debug/package[EXE] +args: [] +"#, + ) .with_stderr( r#"[WARNING] `package.edition` is unspecifiead, defaulting to `2021` -[ERROR] failed to parse manifest at `[ROOT]/foo/42.rs` - -Caused by: - package name cannot be an empty string +[COMPILING] package v0.0.0 ([ROOT]/foo) +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s +[RUNNING] `[..]/debug/package[EXE]` "#, ) .run();