Skip to content

Commit

Permalink
cargo_deps: Fix merge not actually working
Browse files Browse the repository at this point in the history
Merge returns a new Spec. Assign it back to specs.

BUG=b:372902037
TEST=devtools/cargo_deps.py  # and see the nix deps has the features

Change-Id: I9b9da8f2b4902ca6deae2e7920edd2a327e13645
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/5919895
Tested-by: [email protected] <[email protected]>
Reviewed-by: Cranel W <[email protected]>
Commit-Queue: Li-Yu Yu <[email protected]>
  • Loading branch information
afq984 authored and Chromeos LUCI committed Oct 14, 2024
1 parent d225367 commit 1312285
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion devtools/cargo_deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def render(self):
):
continue
s = Spec.parse(spec)
specs.setdefault(name, s).merge(s)
specs[name] = specs.get(name, s).merge(s)

print('# update this to src/third_party/rust_crates/projects/third_party/adhd-deps/Cargo.toml')
print('[dependencies]')
Expand Down

0 comments on commit 1312285

Please sign in to comment.