-
Notifications
You must be signed in to change notification settings - Fork 38.7k
Move src/tinyformat.h to src/tinyformat/tinyformat.h #13846
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
Concept ACK |
| No more conflicts as of last run. |
72e587b to
8b63251
Compare
|
Closing this in favor of #13845, at least I'd say that if we're going to move it anyhow go the full yard and make it a subtree. |
|
Reopening because of @MarcoFalke's concern, agree that #13845 pulls in a bizarrely high number (46!) of files. And the whole intent of |
8b63251 to
8e60387
Compare
src/tinyformat/README.md
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need to add a third party readme. This will show up in all history/logs and greps.
|
Concept ACK |
8e60387 to
c5ee680
Compare
|
Dropped the readme. 👍 |
test/lint/README.md
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Not a subtree
|
utACK c5ee680fdfe806ab6ffbfca47f6cd28e4fb4e049 |
For consistency with other bundled dependencies. Having it in the top-level directory makes it clear that it is a library that we're including rather than a file that is a part of the project. tinyformat/tinyformat.h and tinyformat/README.md are drawn from the existing sha reference: https://github.com/c42f/tinyformat/tree/689695cf58700e6defe3741829564cd682d5ae57 Existing modifications to tinyformat are moved to utilstrprintf.h, clearly separating upstream and project code. 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 below, which are cosmetic or apparently unintentional: 64fb0ac - Declare single-argument (non-converting) constructors "explicit" 4d9b425 - Fix typos Note I excluded only the tinyformat cpp from the boost lint 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.
c5ee680 to
d48249e
Compare
|
Removed inaccurate test/lint/README mention and unnecessary test/lint/lint-includes.sh filter. |
|
re-utACK d48249e |
|
This was discussed at the 2018-08-30 IRC meeting and there was no agreement to do this at all. If there's no agreement how to go forward here, I'd say it's not extremely important to do, so I'm closing both PRs for now. |
|
Imo this could still be done the next time we touch tinyformat, but yeah no rush |
For consistency with other bundled dependencies. Having it in the top-level
directory makes it clear that it is a library that we're including
rather than a file that is a part of the project.
tinyformat/tinyformat.h and tinyformat/README.md are drawn from the existing
sha reference:
https://github.com/c42f/tinyformat/tree/689695cf58700e6defe3741829564cd682d5ae57
Existing modifications to tinyformat are moved to utilstrprintf.h, clearly
separating upstream and project code.
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/cpp9eaa0af - tinyformat: force USE_VARIADIC_TEMPLATES
b651270 - util: Throw tinyformat::format_error on formatting error
This does not include changes below, which are cosmetic or apparently unintentional:
64fb0ac - Declare single-argument (non-converting) constructors "explicit"
4d9b425 - Fix typos
Note I excluded only the tinyformat cpp from the boost lint 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.