Skip to content

Commit f220e64

Browse files
epageepage
committed
refactor(embedded): Simplify temp-manifest dir
1 parent cedfad4 commit f220e64

File tree

2 files changed

+38
-35
lines changed

2 files changed

+38
-35
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,17 @@ impl RawScript {
7171
) -> CargoResult<std::path::PathBuf> {
7272
let hash = self.hash().to_string();
7373
assert_eq!(hash.len(), 64);
74+
let leaf_dir = self
75+
.path
76+
.file_name()
77+
.ok_or_else(|| anyhow::format_err!("no file name"))?
78+
.to_string_lossy();
7479
let mut workspace_root = target_dir.to_owned();
7580
workspace_root.push("eval");
7681
workspace_root.push(&hash[0..2]);
7782
workspace_root.push(&hash[2..4]);
7883
workspace_root.push(&hash[4..]);
79-
workspace_root.push(self.package_name()?);
84+
workspace_root.push(leaf_dir.as_ref());
8085
std::fs::create_dir_all(&workspace_root).with_context(|| {
8186
format!(
8287
"failed to create temporary workspace at {}",

‎tests/testsuite/script.rs

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ args: []
3333
.with_stderr(
3434
"\
3535
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
36-
[COMPILING] echo v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/echo)
36+
[COMPILING] echo v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/echo.rs)
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.rs/target/debug/echo_[..]`
3939
",
4040
)
4141
.run();
@@ -111,9 +111,9 @@ args: []
111111
.with_stderr(
112112
"\
113113
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
114-
[COMPILING] echo v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/echo)
114+
[COMPILING] echo v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/echo.rs)
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.rs/target/debug/echo_[..]`
117117
",
118118
)
119119
.run();
@@ -203,9 +203,9 @@ fn main() {
203203
)
204204
.with_stderr(
205205
"\
206-
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
206+
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script.rs)
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.rs/target/debug/script_[..]`
209209
",
210210
)
211211
.run();
@@ -235,9 +235,9 @@ fn main() {
235235
.with_stderr(
236236
"\
237237
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
238-
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
238+
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script.rs)
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.rs/target/debug/script_[..]`
241241
",
242242
)
243243
.run();
@@ -264,9 +264,9 @@ fn main() {
264264
.with_stderr(
265265
"\
266266
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
267-
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
267+
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script.rs)
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.rs/target/debug/script_[..]`
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.rs/target/debug/script_[..]`
286286
",
287287
)
288288
.run();
@@ -298,9 +298,9 @@ fn main() {
298298
.with_stderr(
299299
"\
300300
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
301-
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
301+
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script.rs)
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.rs/target/debug/script_[..]`
304304
",
305305
)
306306
.run();
@@ -327,9 +327,9 @@ fn main() {
327327
.with_stderr(
328328
"\
329329
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
330-
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
330+
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script.rs)
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.rs/target/debug/script_[..]`
333333
",
334334
)
335335
.run();
@@ -352,9 +352,9 @@ args: ["-NotAnArg"]
352352
.with_stderr(
353353
"\
354354
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
355-
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
355+
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script.rs)
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.rs/target/debug/script_[..] -NotAnArg`
358358
",
359359
)
360360
.run();
@@ -377,9 +377,9 @@ args: ["-NotAnArg"]
377377
.with_stderr(
378378
"\
379379
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
380-
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
380+
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script.rs)
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.rs/target/debug/script_[..] -NotAnArg`
383383
",
384384
)
385385
.run();
@@ -402,9 +402,9 @@ args: ["--help"]
402402
.with_stderr(
403403
"\
404404
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
405-
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
405+
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script.rs)
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.rs/target/debug/script_[..] --help`
408408
",
409409
)
410410
.run();
@@ -413,11 +413,9 @@ args: ["--help"]
413413
#[cargo_test]
414414
fn test_name_has_weird_chars() {
415415
let script = ECHO_SCRIPT;
416-
let p = cargo_test_support::project()
417-
.file("s-h.w§c!.rs", script)
418-
.build();
416+
let p = cargo_test_support::project().file("s-w§c!", script).build();
419417

420-
p.cargo("-Zscript s-h.w§c!.rs")
418+
p.cargo("-Zscript ./s-w§c!")
421419
.masquerade_as_nightly_cargo(&["script"])
422420
.with_stdout(
423421
r#"bin: [ROOT]/home/.cargo/eval/target/eval/[..]
@@ -426,15 +424,15 @@ args: []
426424
)
427425
.with_stderr(
428426
r#"[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
429-
[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
427+
[COMPILING] s-w_c_ v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/s-w§c!)
428+
[WARNING] crate `s_w_c__[..]` should have a snake case name
431429
|
432-
= help: convert the identifier to snake case: `s_h_w_c_[..]`
430+
= help: convert the identifier to snake case: `s_w_c_[..]`
433431
= note: `#[warn(non_snake_case)]` on by default
434432
435-
[WARNING] `s-h_w_c_` (bin "s-h_w_c__[..]") generated 1 warning
433+
[WARNING] `s-w_c_` (bin "s-w_c__[..]") generated 1 warning
436434
[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__[..]`
435+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/s-w§c!/target/debug/s-w_c__[..]`
438436
"#,
439437
)
440438
.run();
@@ -470,9 +468,9 @@ fn main() {
470468
[DOWNLOADING] crates ...
471469
[DOWNLOADED] script v1.0.0 (registry `dummy-registry`)
472470
[COMPILING] script v1.0.0
473-
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
471+
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script.rs)
474472
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
475-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script_[..] --help`
473+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script.rs/target/debug/script_[..] --help`
476474
",
477475
)
478476
.run();
@@ -507,9 +505,9 @@ fn main() {
507505
"\
508506
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
509507
[COMPILING] bar v0.0.1 ([ROOT]/foo/bar)
510-
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script)
508+
[COMPILING] script v0.0.0 ([ROOT]/home/.cargo/eval/target/eval/[..]/script.rs)
511509
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
512-
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script/target/debug/script_[..] --help`
510+
[RUNNING] `[ROOT]/home/.cargo/eval/target/eval/[..]/script.rs/target/debug/script_[..] --help`
513511
",
514512
)
515513
.run();

0 commit comments

Comments
 (0)