Skip to content

Commit fdc2904

Browse files
committed
Auto merge of #12262 - epage:flatten, r=weihanglo
refactor(embedded) ### What does this PR try to resolve? This is trying to make it easier to have multiple active PRs touching `embedded.rs` by separating out the parts of the code that will be touched in each PR. This is done by making the code roughly follow how the future code will be structured. e.g. see #12255 ### How should we test and review this PR? Commit at a time. This is just a refactor, so no tests are changed.
2 parents 000868e + 35a8065 commit fdc2904

File tree

2 files changed

+201
-190
lines changed

2 files changed

+201
-190
lines changed

src/bin/cargo/commands/run.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ pub fn exec_manifest_command(config: &Config, cmd: &str, args: &[OsString]) -> C
101101
);
102102
}
103103
let manifest_path = crate::util::try_canonicalize(manifest_path)?;
104-
let script = cargo::util::toml::embedded::RawScript::parse_from(&manifest_path)?;
105-
let ws = script.to_workspace(config)?;
104+
let script = cargo::util::toml::embedded::parse_from(&manifest_path)?;
105+
let ws = cargo::util::toml::embedded::to_workspace(&script, config)?;
106106

107107
let mut compile_opts =
108108
cargo::ops::CompileOptions::new(config, cargo::core::compiler::CompileMode::Build)?;

0 commit comments

Comments
 (0)