Skip to content

Commit 0c14026

Browse files
borsbors
committed
Auto merge of #12269 - epage:bin, r=weihanglo
fix(embedded): Don't append hash to bin names ### What does this PR try to resolve? More immediately, this is to unblock rust-lang/rust#112601 The hash existed for sharing a target directory. That code isn't implemented yet and a per-user build cache might remove the need for it, so let's remove it for now and more carefully weigh adding it back in. In general, this is also the more appropriate way for a feature that would be first class. ### How should we test and review this PR? This originally built on #12268 but now stands alone as the other PR has windows issues to work out ### Additional information
2 parents c1ccde1 + 56b2812 commit 0c14026

File tree

2 files changed

+18
-25
lines changed

2 files changed

+18
-25
lines changed

‎src/cargo/util/toml/embedded.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,7 @@ fn expand_manifest_(script: &RawScript, config: &Config) -> CargoResult<toml::Ta
142142
.to_string_lossy();
143143
let separator = '_';
144144
let name = sanitize_package_name(file_name.as_ref(), separator);
145-
let hash = hash(script);
146-
let bin_name = format!("{name}{separator}{hash}");
145+
let bin_name = name.clone();
147146
package
148147
.entry("name".to_owned())
149148
.or_insert(toml::Value::String(name));
@@ -449,7 +448,7 @@ mod test_expand {
449448
fn test_default() {
450449
snapbox::assert_eq(
451450
r#"[[bin]]
452-
name = "test_a472c7a31645d310613df407eab80844346938a3b8fe4f392cae059cb181aa85"
451+
name = "test"
453452
path = "/home/me/test.rs"
454453
455454
[package]
@@ -471,7 +470,7 @@ strip = true
471470
fn test_dependencies() {
472471
snapbox::assert_eq(
473472
r#"[[bin]]
474-
name = "test_3a1fa07700654ea2e893f70bb422efa7884eb1021ccacabc5466efe545da8a0b"
473+
name = "test"
475474
path = "/home/me/test.rs"
476475
477476
[dependencies]

‎tests/testsuite/script.rs

+15-21
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ args: []
3535
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
3636
[COMPILING] echo v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/echo)
3737
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
38-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/echo/target/debug/echo_[..]`
38+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/echo/target/debug/echo[EXE]`
3939
",
4040
)
4141
.run();
@@ -59,7 +59,7 @@ args: []
5959
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
6060
[COMPILING] echo v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/echo)
6161
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
62-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/echo/target/debug/echo_[..]`
62+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/echo/target/debug/echo[EXE]`
6363
",
6464
)
6565
.run();
@@ -113,7 +113,7 @@ args: []
113113
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
114114
[COMPILING] echo v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/echo)
115115
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
116-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/echo/target/debug/echo_[..]`
116+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/echo/target/debug/echo[EXE]`
117117
",
118118
)
119119
.run();
@@ -205,7 +205,7 @@ fn main() {
205205
"\
206206
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
207207
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
208-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script_[..]`
208+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script[EXE]`
209209
",
210210
)
211211
.run();
@@ -237,7 +237,7 @@ fn main() {
237237
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
238238
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
239239
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
240-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script_[..]`
240+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script[EXE]`
241241
",
242242
)
243243
.run();
@@ -266,7 +266,7 @@ fn main() {
266266
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
267267
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
268268
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
269-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script_[..]`
269+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script[EXE]`
270270
",
271271
)
272272
.run();
@@ -282,7 +282,7 @@ fn main() {
282282
"\
283283
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
284284
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
285-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script_[..]`
285+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script[EXE]`
286286
",
287287
)
288288
.run();
@@ -300,7 +300,7 @@ fn main() {
300300
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
301301
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
302302
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
303-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script_[..]`
303+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script[EXE]`
304304
",
305305
)
306306
.run();
@@ -329,7 +329,7 @@ fn main() {
329329
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
330330
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
331331
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
332-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script_[..]`
332+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script[EXE]`
333333
",
334334
)
335335
.run();
@@ -354,7 +354,7 @@ args: ["-NotAnArg"]
354354
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
355355
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
356356
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
357-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script_[..] -NotAnArg`
357+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script[EXE] -NotAnArg`
358358
",
359359
)
360360
.run();
@@ -379,7 +379,7 @@ args: ["-NotAnArg"]
379379
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
380380
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
381381
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
382-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script_[..] -NotAnArg`
382+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script[EXE] -NotAnArg`
383383
",
384384
)
385385
.run();
@@ -404,7 +404,7 @@ args: ["--help"]
404404
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
405405
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
406406
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
407-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script_[..] --help`
407+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script[EXE] --help`
408408
",
409409
)
410410
.run();
@@ -427,14 +427,8 @@ args: []
427427
.with_stderr(
428428
r#"[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
429429
[COMPILING] s-h_w_c_ v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/s-h_w_c_)
430-
[WARNING] crate `s_h_w_c__[..]` should have a snake case name
431-
|
432-
= help: convert the identifier to snake case: `s_h_w_c_[..]`
433-
= note: `#[warn(non_snake_case)]` on by default
434-
435-
[WARNING] `s-h_w_c_` (bin "s-h_w_c__[..]") generated 1 warning
436430
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
437-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/s-h_w_c_/target/debug/s-h_w_c__[..]`
431+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/s-h_w_c_/target/debug/s-h_w_c_[EXE]`
438432
"#,
439433
)
440434
.run();
@@ -472,7 +466,7 @@ fn main() {
472466
[COMPILING] script v1.0.0
473467
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
474468
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
475-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script_[..] --help`
469+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script[EXE] --help`
476470
",
477471
)
478472
.run();
@@ -509,7 +503,7 @@ fn main() {
509503
[COMPILING] bar v0.0.1 ([ROOT]/foo/bar)
510504
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
511505
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
512-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script_[..] --help`
506+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script[EXE] --help`
513507
",
514508
)
515509
.run();

0 commit comments

Comments
 (0)