This repository has been archived by the owner on Jan 22, 2025. It is now read-only.
Add more comments about solana-program patch (downstream) #33965
Conversation
This file contains 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
Codecov Report
@@ Coverage Diff @@
## master #33965 +/- ##
=========================================
- Coverage 81.9% 81.9% -0.1%
=========================================
Files 811 811
Lines 219333 219333
=========================================
- Hits 179762 179680 -82
- Misses 39571 39653 +82 |
joncinque
reviewed
Nov 7, 2023
joncinque
approved these changes
Nov 7, 2023
|
I'm going to merge this, but feedback still welcome, @ilya-bobyr ! |
Looks great to me! I wish there would be a way to reduce these hacks, so that it would just work :) |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Problem
I ran into the errors described at #33424 while developing a geyser plugin, despite having the patch statements in my Cargo.toml already. I didn't think to wipe my Cargo.lock until @joncinque suggested it, and it fixed all my problems.
The behavior feels a bit unintuitive. If having compiled successfully, you comment out the patch statements and recompile (fails), cargo adds the crates.io dependencies to the Cargo.lock. If you subsequently uncomment the patch statements and recompile, cargo does not remove these declarations from the Cargo.lock, so the compilation continues to fail.
Summary of Changes
We have helpful comments around the patch statements in the monorepo Cargo.tomls; extend them with some tips about using downstream.
Fixes #33424