qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build-support/rust: rewrite workspace dependency inheritance

Browse Source 
This fixes at least one bug with default-features, and also
just aligns us more with what Cargo actually does.

Also some Python style fixes and a bit less mutating state.
This commit is contained in:
K900 2024-05-10 15:55:42 +03:00
parent d42c1c8d44
commit f80228a805
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkgs/build-support/rust/replace-workspace-values.py
View File

@ -15,6 +15,9 @@ def load_file(path: str) -> dict[str, Any]:
return tomli.load(f) return tomli.load(f)
# This replicates the dependency merging logic from Cargo.
# See `inner_dependency_inherit_with`:
# https://github.com/rust-lang/cargo/blob/4de0094ac78743d2c8ff682489e35c8a7cafe8e4/src/cargo/util/toml/mod.rs#L982
def replace_key( def replace_key(
workspace_manifest: dict[str, Any], table: dict[str, Any], section: str, key: str workspace_manifest: dict[str, Any], table: dict[str, Any], section: str, key: str
) -> bool: ) -> bool:
@ -25,28 +28,37 @@ def replace_key(
): ):
print("replacing " + key) print("replacing " + key)
replaced = table[key] local_dep = table[key]
del replaced["workspace"] del local_dep["workspace"]
workspace_copy = workspace_manifest[section][key] workspace_dep = workspace_manifest[section][key]
if section == "dependencies": if section == "dependencies":
crate_features = replaced.get("features") if isinstance(workspace_dep, str):
workspace_dep = {"version": workspace_dep}
if type(workspace_copy) is str: final: dict[str, Any] = workspace_dep.copy()
replaced["version"] = workspace_copy
else:
replaced.update(workspace_copy)
merged_features = (crate_features or []) + ( merged_features = local_dep.pop("features", []) + workspace_dep.get("features", [])
workspace_copy.get("features") or [] if merged_features:
) final["features"] = merged_features
if len(merged_features) > 0: local_default_features = local_dep.pop("default-features", None)
# Dictionaries are guaranteed to be ordered (https://stackoverflow.com/a/7961425) workspace_default_features = workspace_dep.get("default-features")
replaced["features"] = list(dict.fromkeys(merged_features))
if not workspace_default_features and local_default_features:
final["default-features"] = True
optional = local_dep.pop("optional", False)
if optional:
final["optional"] = True
if local_dep:
raise Exception(f"Unhandled keys in inherited dependency {key}: {local_dep}")
table[key] = final
elif section == "package": elif section == "package":
table[key] = replaced = workspace_copy table[key] = workspace_dep
return True return True