Include tinyformat as a subtree #13834
Closed
Conversation
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
git-subtree-dir: src/tinyformat git-subtree-split: 689695cf58700e6defe3741829564cd682d5ae57
This includes changes in: 695041e - util: Update tinyformat 1b8fd35 - Make tinyformat errors raise an exception instead of assert()ing 9b6d4c5 - Move strprintf define to tinyformat.h 6e5fd00 - Move `*Version()` functions to version.h/cpp 9eaa0af - tinyformat: force USE_VARIADIC_TEMPLATES b651270 - util: Throw tinyformat::format_error on formatting error This does not include changes in: 64fb0ac - Declare single-argument (non-converting) constructors "explicit" 4d9b425 - Fix typos And drop src/tinyformat.h in favor of the subtree src/tinyformat/ Note I excluded only the tinyformat cpp from the boost checks out of an abundance of caution - these files are not actually built into bitcoin so are not at risk of pulling in unwanted dependencies, whereas the header, and other dependencies might be.
Contributor
Author
Contributor
Author
|
wip: I have some build issues to sort out, will reopen when I do |
Member
|
Seems like a lot of files to pull in just to make it a subtree, no? Imo tinyformat is really meant to be a single file just to be copied into the project. You can get the local modifications with |
Contributor
Author
|
I'd be down with other approaches. My main desire is to separate the bitcoin code from the dependency code, and just a sub-folder is sufficient for that. |
Contributor
Author
|
Reopening as the build seems to be sorted. I have pending follow-ups which relate to this that will help to explain the motivation. |
Contributor
Author
|
Huh seems I'm unable to re-open due to the force pushes I made in the interim. Opening a new PR instead. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
This adds the existing c42f/tinyformat@689695c of tinyformat as a subtree, and extracts the modifications that had been made to a
utilstrprintf.hwrapper file which is included instead oftinyformat.hdirectly.The benefits being that this should be easier to verifiably update and clearer what changes are being introduced, while making it easier to identify
tinyformat.has a dependency rather than a project file, and apply special treatment relative to that fact.