fix(rust): ensure extraDependencies overrides take precedence over bundled deps#14588
Merged
fix(rust): ensure extraDependencies overrides take precedence over bundled deps#14588
Conversation
Contributor
🤖 Devin AI EngineerI'll be helping with this pull request! Here's what you should know: ✅ I will automatically:
Note: I can only respond to comments from users who have write access to this repository. ⚙️ Control Options:
|
6bebf12 to
167bce7
Compare
There was a problem hiding this comment.
Claude Code Review
This repository is configured for manual code reviews. Comment @claude review to trigger a review and subscribe this PR to future pushes, or @claude review once for a one-time review.
Tip: disable this comment in your organization's Code Review settings.
…ndled deps Co-Authored-By: judah <jsklan.development@gmail.com>
167bce7 to
31aa41c
Compare
Co-Authored-By: judah <jsklan.development@gmail.com>
iamnamananand996
approved these changes
Apr 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Refs FER-9454
extraDependenciesspecified ingenerators.ymlcould not override conditional bundled dependency versions (e.g.,tokio-tungstenite,reqwest-sse,pin-project). User overrides were applied insideaddBaseDependencies(), butdetectAndAddFeatureDependencies()ran afterward and re-added the bundled versions, reverting any user pins via themergeDependencySpecsspread ({...existing, ...newSpec}— later call wins).Base deps like
serde,reqwest, andtokiowere already correctly overridable since extras were added after them within the same method.Changes Made
addBaseDependencies()into a newapplyExtraDependencies()methodapplyExtraDependencies()is called after bothaddBaseDependencies()anddetectAndAddFeatureDependencies()in the constructor, ensuring user-specified versions always take precedencegenerateExtraDependencies()andgenerateExtraDevDependencies()inRustProject.ts(private methods, never called anywhere — actual Cargo.toml rendering usesdependencyManager.toTomlSections())maxRetriesfeature)ruby-sdkentry fromscripts/validate-all-changelogs.sh(folder was renamed toruby-sdk-v2, causingValidate ChangelogsCI to fail on every PR)Human Review Checklist
applyExtraDependencies()in the constructor — currently the order is:addBaseDependencies()→detectAndAddFeatureDependencies()→applyExtraDependencies()→new RustProject()generateExtraDependencies()/generateExtraDevDependencies()inRustProject.tswere truly dead code (private, no callers)ruby-sdkfromvalidate-all-changelogs.shis correct (seed/ruby-sdkno longer exists;ruby-sdk-v2is already listed)mergeDependencySpecs. This is unchanged behavior — users can add features but not remove bundled ones. Only scalar properties (version, optional, etc.) are overridden.Testing
Validate ChangelogsLink to Devin session: https://app.devin.ai/sessions/dd09dc3fc802408fa0d1bbe6e2e4cd19
Requested by: @jsklan