Skip to content

Commit 667ff78

Browse files
committed
refactor(embedded): Centralize placeholder
This was originally split out because before #12269, it was needed elsewhere.
1 parent f4abdbe commit 667ff78

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

src/cargo/util/toml/embedded.rs

+11-17
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,7 @@ fn write(
8080
.file_stem()
8181
.ok_or_else(|| anyhow::format_err!("no file name"))?
8282
.to_string_lossy();
83-
let separator = if file_name.contains('_') {
84-
'_'
85-
} else {
86-
// Since embedded manifests only support `[[bin]]`s, prefer arrow-case as that is the
87-
// more common convention for CLIs
88-
'-'
89-
};
90-
let name = sanitize_name(file_name.as_ref(), separator);
83+
let name = sanitize_name(file_name.as_ref());
9184

9285
let mut workspace_root = target_dir.to_owned();
9386
workspace_root.push("eval");
@@ -147,14 +140,7 @@ fn expand_manifest_(script: &RawScript, config: &Config) -> CargoResult<toml::Ta
147140
.file_stem()
148141
.ok_or_else(|| anyhow::format_err!("no file name"))?
149142
.to_string_lossy();
150-
let separator = if file_name.contains('_') {
151-
'_'
152-
} else {
153-
// Since embedded manifests only support `[[bin]]`s, prefer arrow-case as that is the
154-
// more common convention for CLIs
155-
'-'
156-
};
157-
let name = sanitize_name(file_name.as_ref(), separator);
143+
let name = sanitize_name(file_name.as_ref());
158144
let bin_name = name.clone();
159145
package
160146
.entry("name".to_owned())
@@ -207,7 +193,15 @@ fn expand_manifest_(script: &RawScript, config: &Config) -> CargoResult<toml::Ta
207193
}
208194

209195
/// Ensure the package name matches the validation from `ops::cargo_new::check_name`
210-
fn sanitize_name(name: &str, placeholder: char) -> String {
196+
fn sanitize_name(name: &str) -> String {
197+
let placeholder = if name.contains('_') {
198+
'_'
199+
} else {
200+
// Since embedded manifests only support `[[bin]]`s, prefer arrow-case as that is the
201+
// more common convention for CLIs
202+
'-'
203+
};
204+
211205
let mut name = restricted_names::sanitize_package_name(name, placeholder);
212206

213207
loop {

0 commit comments

Comments
 (0)