Also handle dict-syntax for "workspace=true"

Author: Flamefire

easybuild/easyblocks/generic/cargo.py

@@ -251,8 +251,8 @@ def do_replacement(section, workspace_section):
             return
 
         for key, value in section.items():
-            if key.endswith(SUFFIX) and value == 'true':
-                real_key = key[:-len(SUFFIX)]
+            if key.endswith(SUFFIX) and value == 'true' or value == '{ workspace = true }':
+                real_key = key[:-len(SUFFIX)] if key.endswith(SUFFIX) else key
                 value = workspace_section[real_key]
                 idx = next(idx for idx, line in enumerate(lines) if key in line)
                 lines[idx] = f'{real_key} = {value}'

test/easyblocks/easyblock_specific.py

@@ -456,7 +456,7 @@ def test_cargo_merge_sub_crate(self):
             cc.workspace = true
 
             [dev-dependencies]
-            rand.workspace = true
+            rand = { workspace = true }
         """))
         cargo.merge_sub_crate(cargo_toml, ws_parsed)
         self.assertEqual(read_file(cargo_toml).strip(), textwrap.dedent("""