Avoid creating Empty TOML tables

prefix-dev · Apr 25, 2024 · b1f0596 · b1f0596
1 parent f7a5366
commit b1f0596
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 41 deletions.
diff --git a/src/project/manifest/document.rs b/src/project/manifest/document.rs
@@ -80,7 +80,7 @@ impl ManifestSource {
 
         let mut current_table = self.as_table_mut();
 
-        for (i, part) in parts.iter().enumerate() {
+        for part in parts {
             current_table = current_table
                 .entry(part)
                 .or_insert(Item::Table(Table::new()))
@@ -92,9 +92,8 @@ impl ManifestSource {
                         table_name
                     )
                 })?;
-            if i < parts.len() - 1 {
-                current_table.set_implicit(true);
-            }
+            // Avoid creating empty tables
+            current_table.set_implicit(true);
         }
         Ok(current_table)
     }
@@ -407,22 +406,24 @@ mod tests {
         let mut manifest = Manifest::from_str(Path::new("pixi.toml"), PROJECT_BOILERPLATE).unwrap();
         let _ = manifest
             .document
-            .get_or_insert_toml_table(None, &FeatureName::Default, "tasks");
-        let _ = manifest.document.get_or_insert_toml_table(
-            Some(Platform::Linux64),
-            &FeatureName::Default,
-            "tasks",
-        );
-        let _ = manifest.document.get_or_insert_toml_table(
-            None,
-            &FeatureName::Named("test".to_string()),
-            "tasks",
-        );
-        let _ = manifest.document.get_or_insert_toml_table(
-            Some(Platform::Linux64),
-            &FeatureName::Named("test".to_string()),
-            "tasks",
-        );
+            .get_or_insert_toml_table(None, &FeatureName::Default, "tasks")
+            .map(|t| t.set_implicit(false));
+        let _ = manifest
+            .document
+            .get_or_insert_toml_table(Some(Platform::Linux64), &FeatureName::Default, "tasks")
+            .map(|t| t.set_implicit(false));
+        let _ = manifest
+            .document
+            .get_or_insert_toml_table(None, &FeatureName::Named("test".to_string()), "tasks")
+            .map(|t| t.set_implicit(false));
+        let _ = manifest
+            .document
+            .get_or_insert_toml_table(
+                Some(Platform::Linux64),
+                &FeatureName::Named("test".to_string()),
+                "tasks",
+            )
+            .map(|t| t.set_implicit(false));
         assert_snapshot!(manifest.document.to_string());
     }
 

diff --git a/src/project/manifest/snapshots/pixi__project__manifest__tests__test_remove_bar.snap b/src/project/manifest/snapshots/pixi__project__manifest__tests__test_remove_bar.snap
@@ -2,7 +2,6 @@
 source: src/project/manifest/mod.rs
 expression: manifest.document.to_string()
 ---
-
             [project]
             name = "foo"
             version = "0.1.0"
@@ -12,8 +11,5 @@ expression: manifest.document.to_string()
             [dependencies]
             fooz = "*"
 
-            [target.win-64.dependencies]
-
             [target.linux-64.build-dependencies]
             baz = "*"
-
diff --git a/src/project/manifest/snapshots/pixi__project__manifest__tests__test_remove_baz.snap b/src/project/manifest/snapshots/pixi__project__manifest__tests__test_remove_baz.snap
@@ -2,7 +2,6 @@
 source: src/project/manifest/mod.rs
 expression: manifest.document.to_string()
 ---
-
             [project]
             name = "foo"
             version = "0.1.0"
@@ -14,6 +13,3 @@ expression: manifest.document.to_string()
 
             [target.win-64.dependencies]
             bar = "*"
-
-            [target.linux-64.build-dependencies]
-
diff --git a/src/project/manifest/snapshots/pixi__project__manifest__tests__test_remove_fooz.snap b/src/project/manifest/snapshots/pixi__project__manifest__tests__test_remove_fooz.snap
@@ -2,18 +2,14 @@
 source: src/project/manifest/mod.rs
 expression: manifest.document.to_string()
 ---
-
             [project]
             name = "foo"
             version = "0.1.0"
             channels = []
             platforms = ["linux-64", "win-64"]
 
-            [dependencies]
-
             [target.win-64.dependencies]
             bar = "*"
 
             [target.linux-64.build-dependencies]
             baz = "*"
-
diff --git a/...ject/manifest/snapshots/pixi__project__manifest__tests__test_remove_pypi_feature_dep.snap b/...ject/manifest/snapshots/pixi__project__manifest__tests__test_remove_pypi_feature_dep.snap
@@ -22,8 +22,5 @@ requests = "*"
 xpackage = "==1.2.3"
 ypackage = {version = ">=1.2.3"}
 
-[feature.test.pypi-dependencies]
-
 [feature.test.target.linux-64.pypi-dependencies]
 feature_target_dep = "*"
-
diff --git a/...nifest/snapshots/pixi__project__manifest__tests__test_remove_pypi_feature_target_dep.snap b/...nifest/snapshots/pixi__project__manifest__tests__test_remove_pypi_feature_target_dep.snap
@@ -24,6 +24,3 @@ ypackage = {version = ">=1.2.3"}
 
 [feature.test.pypi-dependencies]
 feature_dep = "*"
-
-[feature.test.target.linux-64.pypi-dependencies]
-
diff --git a/...project/manifest/snapshots/pixi__project__manifest__tests__test_remove_pypi_requests.snap b/...project/manifest/snapshots/pixi__project__manifest__tests__test_remove_pypi_requests.snap
@@ -11,8 +11,6 @@ platforms = ["linux-64", "win-64"]
 [dependencies]
 python = ">=3.12.1,<3.13"
 
-[pypi-dependencies]
-
 [target.win-64.pypi-dependencies]
 jax = { version = "*", extras = ["cpu"] }
 requests = "*"
@@ -26,4 +24,3 @@ feature_dep = "*"
 
 [feature.test.target.linux-64.pypi-dependencies]
 feature_target_dep = "*"
-