Consider build-dependencies correctly

Author: qryxip

onlinejudge_verify/languages/rust.py

@@ -69,21 +69,23 @@ def _list_dependencies_by_crate(path: pathlib.Path, *, basedir: pathlib.Path, ca
 
     packages_by_id = {p['id']: p for p in metadata['packages']}
 
-    # Collect the `(|dev-|build-)dependencies` into a <"extern crate name"> → <package> dictionary.
-    dependencies = {}
+    # Collect the `(|dev-|build-)dependencies` into a <is a `build-dependency`> → (<"extern crate name"> → <package>) dictionary.
+    dependencies: Dict[bool, Dict[str, Dict[str, Any]]] = {False: {}, True: {}}
     for dep in next(n['deps'] for n in metadata['resolve']['nodes'] if n['id'] == main_package['id']):
-        if _need_dev_deps(main_target) or any(dep_kind['kind'] != ['dev'] for dep_kind in dep['dep_kinds']):
-            dependencies[dep['name']] = packages_by_id[dep['pkg']]
+        if any(k['kind'] == ['build'] for k in dep['dep_kinds']):
+            dependencies[True][dep['name']] = packages_by_id[dep['pkg']]
+        if _need_dev_deps(main_target) or any(k['kind'] is None for k in dep['dep_kinds']):
+            dependencies[False][dep['name']] = packages_by_id[dep['pkg']]
 
     # Decides whether to include `main_package` itself.
     # Note that cargo-udeps does not detect it if it is unused.
     # https://github.com/est31/cargo-udeps/pull/35
     depends_on_main_package_itself = not _is_lib_or_proc_macro(main_target) and any(map(_is_lib_or_proc_macro, main_package['targets']))
 
     # If `cargo_udeps_toolchain` is present, collects packages that are "unused" by `target`.
-    unused_packages = set()
+    unused_packages: Dict[bool, Set[str]] = {False: set(), True: set()}
     if cargo_udeps_toolchain is not None:
-        explicit_names_in_toml = {d['rename'] for d in main_package['dependencies'] if d['rename']}
+        explicit_names_in_toml = {(d['kind'] == 'build', d['rename']) for d in main_package['dependencies'] if d['rename']}
         if not shutil.which('cargo-udeps'):
             raise RuntimeError('`cargo-udeps` not in $PATH')
         unused_deps = json.loads(subprocess.run(
@@ -94,21 +96,23 @@ def _list_dependencies_by_crate(path: pathlib.Path, *, basedir: pathlib.Path, ca
         ).stdout.decode())['unused_deps'].values()
         unused_dep = next((u for u in unused_deps if u['manifest_path'] == main_package['manifest_path']), None)
         if unused_dep:
-            for name_in_toml in [*unused_dep['normal'], *unused_dep['development'], *unused_dep['build']]:
-                if name_in_toml in explicit_names_in_toml:
+            for is_build, name_in_toml in [*[(False, n) for n in [*unused_dep['normal'], *unused_dep['development']]], *[(True, n) for n in unused_dep['build']]]:
+                if (is_build, name_in_toml) in explicit_names_in_toml:
                     # If the `name_in_toml` is explicitly renamed one, it equals to the `extern_crate_name`.
-                    unused_packages.add(dependencies[name_in_toml]['id'])
+                    unused_packages[is_build].add(dependencies[is_build][name_in_toml]['id'])
                 else:
                     # Otherwise, it equals to the `package.name`.
-                    unused_packages.add(next(p['id'] for p in dependencies.values() if p['name'] == name_in_toml))
+                    unused_packages[is_build].add(next(p['id'] for p in dependencies[is_build].values() if p['name'] == name_in_toml))
 
     # Finally, adds source files related to the depended crates except:
     #
     # - those detected by cargo-udeps
     # - those come from Crates.io or Git repositories (e.g. `proconio`, other people's libraries including `ac-library-rs`)
     ret = common_result
-    for depended_package in [*dependencies.values(), *([main_package] if depends_on_main_package_itself else [])]:
-        if depended_package['id'] in unused_packages or depended_package['source']:
+    depended_packages = [(False, main_package)] if depends_on_main_package_itself else []
+    depended_packages.extend((is_build, package) for is_build, dependencies in dependencies.items() for package in dependencies.values())
+    for is_build, depended_package in depended_packages:
+        if depended_package['id'] in unused_packages[is_build] or depended_package['source']:
             continue
         depended_target = next(filter(_is_lib_or_proc_macro, depended_package['targets']), None)
         if depended_target: