This repository has been archived by the owner on Jan 13, 2025. It is now read-only.
merkle-tree: fix build when targeting bpf #16335
Merged
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 #16335 +/- ##
=======================================
Coverage 80.1% 80.1%
=======================================
Files 411 411
Lines 110134 110134
=======================================
+ Hits 88242 88257 +15
+ Misses 21892 21877 -15 |
jackcmay
approved these changes
Apr 3, 2021
This was referenced Apr 3, 2021
mergify bot
added a commit
that referenced
this pull request
Apr 5, 2021
* merkle-tree: Add Xargo.toml (cherry picked from commit a1d9b53) * merkle-tree: Get `Hash` et. al from program instead of sdk (cherry picked from commit ddc0a16) * merkle-tree: Use `matches` crate when targeting eBPF (cherry picked from commit a44c326) Co-authored-by: Trent Nelson <trent@solana.com>
mergify bot
added a commit
that referenced
this pull request
Apr 5, 2021
* merkle-tree: Add Xargo.toml (cherry picked from commit a1d9b53) * merkle-tree: Get `Hash` et. al from program instead of sdk (cherry picked from commit ddc0a16) * merkle-tree: Use `matches` crate when targeting eBPF (cherry picked from commit a44c326) Co-authored-by: Trent Nelson <trent@solana.com>
Closed
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
solana-merkle-treebuild fails when targeting bpf and someone wants to use it in a program 😬Summary of Changes
Add
Xargo.tomlGet
Hashfromsolana-programinstead ofsolana-sdkGet
matches!()from thematchescrate when targeting bpf (until we're targeting Rust 1.42.0+)