Skip to content

Commit d0a2e7e

Browse files
committed
Use relative path if possible
1 parent 4841dd8 commit d0a2e7e

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

src/manifest.rs

+14-7
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,16 @@ pub fn split_input(
9696
info!("part_mani: {:?}", part_mani);
9797
info!("source: {:?}", source);
9898

99-
let source_path_str = source_path
100-
.to_str()
101-
.ok_or_else(|| format!("Unable to stringify {source_path:?}"))?;
99+
let source_path_from_package = if template.is_some() {
100+
script_name
101+
} else {
102+
source_path
103+
.to_str()
104+
.ok_or_else(|| format!("Unable to stringify {source_path:?}"))?
105+
};
102106

103107
// It's-a mergin' time!
104-
let def_mani = default_manifest(input, bin_name, source_path_str, toolchain);
108+
let def_mani = default_manifest(input, bin_name, source_path_from_package, toolchain);
105109
let dep_mani = deps_manifest(deps)?;
106110

107111
let mani = merge_manifest(def_mani, part_mani)?;
@@ -411,7 +415,7 @@ println!("Hello")"#)),
411415
"{}{}",
412416
r#"[[bin]]
413417
name = "binary-name"
414-
path = "/package/main.rs"
418+
path = "main.rs"
415419
416420
[dependencies]
417421
@@ -423,12 +427,15 @@ version = "0.1.0""#,
423427
STRIP_SECTION
424428
),
425429
"/package/main.rs",
426-
Some(r#"
430+
Some(
431+
r#"
427432
fn main() -> Result<(), Box<dyn std::error::Error+Sync+Send>> {
428433
{println!("Hello")}
429434
Ok(())
430435
}
431-
"#.to_string())
436+
"#
437+
.to_string()
438+
)
432439
)
433440
);
434441
}

0 commit comments

Comments
 (0)