development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-09-13 04:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix key formatting when switching to a dotted WorkspaceSource

Browse source
This commit is contained in:
Scott Schafer 2022-05-26 14:02:00 -05:00
parent 39ad1039d9
commit 706e5b25c9
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/cargo/ops/cargo_add/dependency.rs
View file

@ -486,9 +486,7 @@ impl Dependency {
if str_or_1_len_table(item) {
// Nothing to preserve
*item = self.to_toml(crate_root);
if self.source != Some(Source::Workspace(WorkspaceSource)) {
key.fmt();
}
key.fmt();
} else if let Some(table) = item.as_table_like_mut() {
match &self.source {
Some(Source::Registry(src)) => {
@ -940,6 +938,7 @@ impl Display for WorkspaceSource {
mod tests {
use std::path::Path;
use crate::ops::cargo_add::manifest::LocalManifest;
use cargo_util::paths;
use super::*;
@ -1123,6 +1122,25 @@ mod tests {
verify_roundtrip(&crate_root, key, &item);
}
#[test]
fn overwrite_with_workspace_source_fmt_key() {
let crate_root =
paths::normalize_path(&std::env::current_dir().unwrap().join(Path::new("./")));
let toml = "dep = \"1.0\"\n";
let manifest = toml.parse().unwrap();
let mut local = LocalManifest {
path: crate_root.clone(),
manifest,
};
assert_eq!(local.manifest.to_string(), toml);
for (key, item) in local.data.clone().iter() {
let dep = Dependency::from_toml(&crate_root, key, item).unwrap();
let dep = dep.set_source(WorkspaceSource::new());
local.insert_into_table(&vec![], &dep).unwrap();
assert_eq!(local.data.to_string(), "dep.workspace = true\n");
}
}
#[test]
#[cfg(windows)]
fn normalise_windows_style_paths() {