Changes based on PR feedback

Author: cottsay

colcon_cargo/task/cargo/build.py

@@ -10,6 +10,7 @@
 from colcon_core.logging import colcon_logger
 from colcon_core.plugin_system import satisfies_version
 from colcon_core.shell import create_environment_hook, get_command_environment
+from colcon_core.task import create_file
 from colcon_core.task import install
 from colcon_core.task import run
 from colcon_core.task import TaskExtensionPoint
@@ -271,11 +272,14 @@ async def _install_package(self, version, env):
         contents = await self._get_crate_contents(env)
         crate_path = Path(
             'share', 'cargo', 'registry', f'{self.context.pkg.name}-{version}')
-        crate_path.mkdir(parents=True, exist_ok=True)
 
         for file in contents:
             dst = crate_path / file
             install(self.context.args, file, dst)
 
-        (crate_path / '.cargo-checksum.json').write_text(
-            '{"files":{},"package":""}\n')
+        # Cargo "directory sources" require a checksum file to be included in
+        # the package metadata (though it need not list all of the files).
+        create_file(
+            self.context.args,
+            crate_path / '.cargo-checksum.json',
+            content='{"files":{},"package":""}\n')

test/test_build.py

@@ -27,6 +27,7 @@
 TEST_PACKAGE_NAME = 'rust-sample-package'
 PURE_LIBRARY_PACKAGE_NAME = 'rust-pure-library'
 WORKSPACE_PACKAGE_NAME = 'rust-workspace'
+WORKSPACE_PACKAGE_VERSION = '0.1.0'
 
 test_project_path = Path(__file__).parent / TEST_PACKAGE_NAME
 pure_library_path = Path(__file__).parent / PURE_LIBRARY_PACKAGE_NAME
@@ -316,7 +317,10 @@ def test_workspace_with_package():
 
             # There should also be an unpacked library create
             registry_path = install_base / 'share' / 'cargo' / 'registry'
-            crate_path = registry_path / f'{WORKSPACE_PACKAGE_NAME}-0.1.0'
+            crate_path = registry_path / '-'.join((
+                WORKSPACE_PACKAGE_NAME,
+                WORKSPACE_PACKAGE_VERSION,
+            ))
             assert tuple(registry_path.iterdir()) == (crate_path,)
             assert (crate_path / 'Cargo.toml').is_file()
             assert (crate_path / 'src' / 'lib.rs').is_file()