cargo-upgrade and single item tables

src/dependency.rs

@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
 
-use super::manifest::str_or_1_len_table;
+use super::manifest::str_or_1_len_inline_table;
 
 /// A dependency handled by Cargo
 #[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Clone)]
@@ -422,7 +422,7 @@ impl Dependency {
     /// Modify existing entry to match this dependency
     pub fn update_toml(&self, crate_root: &Path, item: &mut toml_edit::Item) {
         #[allow(clippy::if_same_then_else)]
-        if str_or_1_len_table(item) {
+        if str_or_1_len_inline_table(item) {
             // Nothing to preserve
             *item = self.to_toml(crate_root);
         } else if !is_package_eq(item, &self.name, self.rename.as_deref()) {

src/manifest.rs

@@ -686,8 +686,12 @@ fn old_version_compatible(dependency: &Dependency, old_version: &str) -> CargoRe
     Ok(old_version.matches(&current_version))
 }
 
-pub fn str_or_1_len_table(item: &toml_edit::Item) -> bool {
-    item.is_str() || item.as_table_like().map(|t| t.len() == 1).unwrap_or(false)
+pub fn str_or_1_len_inline_table(item: &toml_edit::Item) -> bool {
+    item.is_str()
+        || item
+            .as_inline_table()
+            .map(|t| t.len() == 1)
+            .unwrap_or(false)
 }
 
 /// Print a message if the new dependency version is different from the old one.

tests/cmd/upgrade/preserve_1_len_table.in/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "cargo-list-test-fixture"
+version = "0.0.0"
+
+[dependencies]
+inline_table = { version = "0.1.0" }
+string = "0.1.0"
+
+[dependencies.table]
+version = "0.1.0"

tests/cmd/upgrade/preserve_1_len_table.out/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "cargo-list-test-fixture"
+version = "0.0.0"
+
+[dependencies]
+inline_table = "99999.0.0"
+string = "99999.0.0"
+
+[dependencies.table]
+version = "99999.0.0"

tests/cmd/upgrade/preserve_1_len_table.toml

@@ -0,0 +1,15 @@
+bin.name = "cargo-upgrade"
+args = ["upgrade"]
+status = "success"
+stdout = """
+cargo-list-test-fixture:
+"""
+stderr = """
+    Upgrading inline_table v0.1.0 -> v99999.0.0
+    Upgrading string v0.1.0 -> v99999.0.0
+    Upgrading table v0.1.0 -> v99999.0.0
+"""
+fs.sandbox = true
+
+[env.add]
+CARGO_IS_TEST="1"