Skip to content

Commit 35a8065

Browse files
committed
refactor(embedded): Centralize separator choice
1 parent 3bbd1e5 commit 35a8065

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

src/cargo/util/toml/embedded.rs

+8-6
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ fn write(
7979
.file_stem()
8080
.ok_or_else(|| anyhow::format_err!("no file name"))?
8181
.to_string_lossy();
82-
let name = sanitize_package_name(file_name.as_ref());
82+
let separator = '_';
83+
let name = sanitize_package_name(file_name.as_ref(), separator);
8384

8485
let mut workspace_root = target_dir.to_owned();
8586
workspace_root.push("eval");
@@ -139,9 +140,10 @@ fn expand_manifest_(script: &RawScript, config: &Config) -> CargoResult<toml::Ta
139140
.file_stem()
140141
.ok_or_else(|| anyhow::format_err!("no file name"))?
141142
.to_string_lossy();
142-
let name = sanitize_package_name(file_name.as_ref());
143+
let separator = '_';
144+
let name = sanitize_package_name(file_name.as_ref(), separator);
143145
let hash = hash(script);
144-
let bin_name = format!("{name}_{hash}");
146+
let bin_name = format!("{name}{separator}{hash}");
145147
package
146148
.entry("name".to_owned())
147149
.or_insert(toml::Value::String(name));
@@ -192,12 +194,12 @@ fn expand_manifest_(script: &RawScript, config: &Config) -> CargoResult<toml::Ta
192194
Ok(manifest)
193195
}
194196

195-
fn sanitize_package_name(name: &str) -> String {
197+
fn sanitize_package_name(name: &str, placeholder: char) -> String {
196198
let mut slug = String::new();
197199
for (i, c) in name.chars().enumerate() {
198200
match (i, c) {
199201
(0, '0'..='9') => {
200-
slug.push('_');
202+
slug.push(placeholder);
201203
slug.push(c);
202204
}
203205
(_, '0'..='9') | (_, 'a'..='z') | (_, '_') | (_, '-') => {
@@ -208,7 +210,7 @@ fn sanitize_package_name(name: &str) -> String {
208210
slug.push(c.to_ascii_lowercase());
209211
}
210212
(_, _) => {
211-
slug.push('_');
213+
slug.push(placeholder);
212214
}
213215
}
214216
}

0 commit comments

Comments
 (0)