Skip to content

Commit

Permalink
Auto merge of #12262 - epage:flatten, r=weihanglo
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Jun 13, 2023
2 parents 000868e + 35a8065 commit fdc2904
Show file tree
Hide file tree
Showing 2 changed files with 201 additions and 190 deletions.
4 changes: 2 additions & 2 deletions src/bin/cargo/commands/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ pub fn exec_manifest_command(config: &Config, cmd: &str, args: &[OsString]) -> C
);
}
let manifest_path = crate::util::try_canonicalize(manifest_path)?;
let script = cargo::util::toml::embedded::RawScript::parse_from(&manifest_path)?;
let ws = script.to_workspace(config)?;
let script = cargo::util::toml::embedded::parse_from(&manifest_path)?;
let ws = cargo::util::toml::embedded::to_workspace(&script, config)?;

let mut compile_opts =
cargo::ops::CompileOptions::new(config, cargo::core::compiler::CompileMode::Build)?;
Expand Down
Loading

0 comments on commit fdc2904

Please sign in to comment.