Skip to content

fix(embedded): Don't create an intermediate manifest #12268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 6 commits into from
Jun 17, 2023
Merged

fix(embedded): Don't create an intermediate manifest #12268

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4fe39e8
refactor(embedded): Be accurate in variable name
epage Jun 15, 2023
fc0bb8b
fix(toml)!: Prevent people parsing manifests from strings
epage Jun 13, 2023
2c70983
test(embedded): Verify no autobin behavior is running
epage Jun 14, 2023
575b9ac
fix(embedded): Don't create an intermediate manifest
epage Jun 13, 2023
5ed0792
fix(embedded): Ensure we don't auto-discover any targets
epage Jun 14, 2023
224d2e6
fix(cli): Make 'cargo foo.rs' behave like --manifest-path
epage Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
refactor(embedded): Be accurate in variable name
  • Loading branch information
@epage
epage committed Jun 17, 2023
commit 4fe39e88c29e879ecc8a3a3cb291fcf8e26c0c6d
8 changes: 4 additions & 4 deletions src/cargo/util/toml/embedded.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ fn write(
let hash = hash(script).to_string();
assert_eq!(hash.len(), 64);

let file_name = script
let file_stem = script
.path
.file_stem()
.ok_or_else(|| anyhow::format_err!("no file name"))?
.to_string_lossy();
let name = sanitize_name(file_name.as_ref());
let name = sanitize_name(file_stem.as_ref());

let mut workspace_root = target_dir.to_owned();
workspace_root.push("eval");
Expand Down Expand Up @@ -135,12 +135,12 @@ fn expand_manifest_(script: &RawScript, config: &Config) -> CargoResult<toml::Ta
anyhow::bail!("`package.{key}` is not allowed in embedded manifests")
}
}
let file_name = script
let file_stem = script
.path
.file_stem()
.ok_or_else(|| anyhow::format_err!("no file name"))?
.to_string_lossy();
let name = sanitize_name(file_name.as_ref());
let name = sanitize_name(file_stem.as_ref());
let bin_name = name.clone();
package
.entry("name".to_owned())
Expand Down