Handle warnings in cargo output

Author: Flamefire

easybuild/easyblocks/generic/cargo.py

@@ -225,38 +225,30 @@ def __init__(self, *args, **kwargs):
         self.cargo_home = os.path.join(self.builddir, '.cargo')
         self.set_cargo_vars()
 
+        # Populate sources from "crates" list of tuples
+        sources = []
+        for crate_info in self.crates:
+            if len(crate_info) == 2:
+                sources.append({
+                    'download_filename': self.crate_download_filename(*crate_info),
+                    'filename': self.crate_src_filename(*crate_info),
+                    'source_urls': [CRATESIO_SOURCE],
+                    'alt_location': 'crates.io',
+                })
+            else:
+                crate, version, repo, rev = crate_info
+                url, repo_name = repo.rsplit('/', maxsplit=1)
+                if repo_name.endswith('.git'):
+                    repo_name = repo_name[:-4]
+                sources.append({
+                    'git_config': {'url': url, 'repo_name': repo_name, 'commit': rev},
+                    'filename': self.crate_src_filename(crate, version, rev=rev),
+                })
+
         # copy EasyConfig instance before we make changes to it
         self.cfg = self.cfg.copy()
 
-        if self.is_extension:
-            self.cfg['crates'] = self.options.get('crates', [])  # Don't inherit crates from parent
-            # The (regular) extract step for extensions is not run so our handling of crates as (multiple) sources
-            # cannot be used for extensions.
-            if self.crates:
-                raise EasyBuildError(f"Extension '{self.name}' cannot have crates. "
-                                     "You can add them to the top-level config parameters when using e.g."
-                                     "the Cargo or CargoPythonBundle easyblock.")
-        else:
-            # Populate sources from "crates" list of tuples
-            sources = []
-            for crate_info in self.crates:
-                if len(crate_info) == 2:
-                    sources.append({
-                        'download_filename': self.crate_download_filename(*crate_info),
-                        'filename': self.crate_src_filename(*crate_info),
-                        'source_urls': [CRATESIO_SOURCE],
-                        'alt_location': 'crates.io',
-                    })
-                else:
-                    crate, version, repo, rev = crate_info
-                    url, repo_name = repo.rsplit('/', maxsplit=1)
-                    if repo_name.endswith('.git'):
-                        repo_name = repo_name[:-4]
-                    sources.append({
-                        'git_config': {'url': url, 'repo_name': repo_name, 'commit': rev},
-                        'filename': self.crate_src_filename(crate, version, rev=rev),
-                    })
-            self.cfg.update('sources', sources)
+        self.cfg.update('sources', sources)
 
     def set_cargo_vars(self):
         """Set environment variables for Rust compilation and Cargo"""
@@ -495,33 +487,40 @@ def configure_step(self):
         """Create lockfile if it doesn't exist"""
         cargo_lock = 'Cargo.lock'
         if self.crates and os.path.exists('Cargo.toml') and not os.path.exists(cargo_lock):
-            root_toml = run_shell_cmd('cargo locate-project --message-format=plain --workspace').output
-            cargo_lock_path = os.path.join(os.path.dirname(root_toml), cargo_lock)
-            if not os.path.exists(cargo_lock_path):
-                rust_version = LooseVersion(get_software_version('Rust'))
-                # File format version, the latest supported is used for forward compatibility
-                # Versions 1 and 2 were internal only, 2 being autodetected
-                # 1.47 introduced the version marker as version 3
-                # 1.78 marked version 4 as stable
-                if rust_version < '1.47':
-                    version = None
-                elif rust_version < '1.78':
-                    version = 3
-                else:
-                    version = 4
-                # Use vendored crates to ensure those versions are used
-                self.log.info(f"No {cargo_lock} file found, creating one at {cargo_lock_path}")
-                content = f'version = {version}\n' if version is not None else ''
-                for crate_info in self.crates:
-                    if len(crate_info) == 2:
-                        name, version = crate_info
-                        source = CRATES_REGISTRY_URL
+            locate_project_output = run_shell_cmd('cargo -q locate-project --message-format=plain --workspace').output
+            # Usually it is the only line, but there might be some prior messages like warnings
+            # Find path right path by going backwards through each line
+            try:
+                root_toml = next(p for p in locate_project_output.splitlines()[::-1] if os.path.exists(p))
+            except StopIteration:
+                self.log.warning("Failed to find project Cargo.toml. Skipping lockfile check & creation.")
+            else:
+                cargo_lock_path = os.path.join(os.path.dirname(root_toml), cargo_lock)
+                if not os.path.exists(cargo_lock_path):
+                    rust_version = LooseVersion(get_software_version('Rust'))
+                    # File format version, the latest supported is used for forward compatibility
+                    # Versions 1 and 2 were internal only, 2 being autodetected
+                    # 1.47 introduced the version marker as version 3
+                    # 1.78 marked version 4 as stable
+                    if rust_version < '1.47':
+                        version = None
+                    elif rust_version < '1.78':
+                        version = 3
                     else:
-                        name, version, repo, rev = crate_info
-                        source = f'git+{repo}?rev={rev}#{rev}'
-
-                    content += CONFIG_LOCK_SOURCE.format(name=name, version=version, source=source)
-                write_file(cargo_lock_path, content)
+                        version = 4
+                    # Use vendored crates to ensure those versions are used
+                    self.log.info(f"No {cargo_lock} file found, creating one at {cargo_lock_path}")
+                    content = f'version = {version}\n' if version is not None else ''
+                    for crate_info in self.crates:
+                        if len(crate_info) == 2:
+                            name, version = crate_info
+                            source = CRATES_REGISTRY_URL
+                        else:
+                            name, version, repo, rev = crate_info
+                            source = f'git+{repo}?rev={rev}#{rev}'
+
+                        content += CONFIG_LOCK_SOURCE.format(name=name, version=version, source=source)
+                    write_file(cargo_lock_path, content)
 
     @property
     def profile(self):