git(source-scan): resolve conflicts with main
#162
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
Adds support for passing feature flags to `cargo`. ## Motivation Smart contract developers will sometimes use [feature flags](https://doc.rust-lang.org/cargo/reference/features.html#the-features-section) to enable/disable certain portions of code during compilation (e.g. enable certain debugging features for the testnet version which are not available in the production version). ## Usage ```txt cargo near build --features feat1,feat2 ``` ```txt cargo near build --no-default-features ``` ## Implementation Notes It does no validation of the input received to the flag, transparently forwarding it as an opaque string directly to `cargo`, after appending `near-sdk/__abi-embed` if necessary.
dj8yfo
force-pushed
the
source-scan-mergemain2
branch
from
330bdf1
to
0dc93d8
Compare
dj8yfo
force-pushed
the
source-scan-mergemain2
branch
from
e649abc
to
91ea60d
Compare
dj8yfo
changed the title
mainmain
…s` with `build_command` in `Cargo.toml`
dj8yfo
force-pushed
the
source-scan-mergemain2
branch
from
91ea60d
to
a99e6ea
Compare
frol
approved these changes
May 13, 2024
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.
commit ca13500 was lost in merge of #159, as it was accidentally not pushed to remote before merge,
which was discovered when testing on contract
SIDENOTE: commit 787c3a4 fixes somewhat unrelated problem, also present in
main.It can be cherry-picked into a standalone pr to
main:as
cargo metadatais called without any additional args (--featuresor whatnot), the following diff:results in
which somewhat contradicts no explicit
abifeature , which is promoted for use by near-docs