Closed Bug 1424096 Opened 2 years ago Closed 2 years ago

Sync up Cargo.lock files to use single versions of common dependencies

Categories

(Firefox Build System :: General, enhancement)

40 Branch
enhancement
Not set

Tracking

(firefox59 fixed)

RESOLVED FIXED
mozilla59
Tracking Status
firefox59 --- fixed

People

(Reporter: mbrubeck, Assigned: mbrubeck)

References

Details

Attachments

(1 file)

If two Cargo.lock files in the tree use slightly different versions of a crate, then both versions are vendored into the tree.  This patch consolidates on a single version of each crate (the newest one) wherever possible, eliminating a ton of duplicate code from the tree.
Component: CSS Parsing and Computation → Build Config
See Also: → 1404894, 1408357, 1418682
Attachment #8935576 - Flags: review?(core-build-config-reviews)
Comment on attachment 8935576 [details]
Bug 1424096 - Consolidate on a single version of each vendored Rust crate

https://reviewboard.mozilla.org/r/206456/#review212446

thanks for the cleanup!
Attachment #8935576 - Flags: review+
Attachment #8935576 - Flags: review?(core-build-config-reviews)
We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s f1827d0f78a1 -d e6cd64922e36: rebasing 438366:f1827d0f78a1 "Bug 1424096 - Consolidate on a single version of each vendored Rust crate r=rillian" (tip)
merging testing/geckodriver/Cargo.lock
merging toolkit/library/gtest/rust/Cargo.lock
merging toolkit/library/rust/Cargo.lock
warning: conflicts while merging testing/geckodriver/Cargo.lock! (edit, then use 'hg resolve --mark')
warning: conflicts while merging toolkit/library/gtest/rust/Cargo.lock! (edit, then use 'hg resolve --mark')
warning: conflicts while merging toolkit/library/rust/Cargo.lock! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
Looks like you have some bit rot.
Flags: needinfo?(mbrubeck)
Rebased.
Flags: needinfo?(mbrubeck)
Pushed by mbrubeck@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/fc95dc810877
Consolidate on a single version of each vendored Rust crate r=rillian
https://hg.mozilla.org/mozilla-central/rev/fc95dc810877
https://hg.mozilla.org/mozilla-central/rev/45e4d6e9d823
Status: ASSIGNED → RESOLVED
Closed: 2 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla59
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.