Skip to content
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

Update tinyformat #791

Merged
merged 6 commits into from
Dec 21, 2017
Merged

Update tinyformat #791

merged 6 commits into from
Dec 21, 2017

Conversation

krlmlr
Copy link
Contributor

@krlmlr krlmlr commented Dec 20, 2017

Fixes #786.

@eddelbuettel
Copy link
Member

I'll probably merge Kevin's PR next, and if "just merge" this we get nasty graph. Shall we bother with rebasing or should I just squash this in? Undecided so far if it needs rev.dep run by itself. Maybe ...

@krlmlr
Copy link
Contributor Author

krlmlr commented Dec 20, 2017

I can rebase if it helps. Still need to update inst/NEWS.

@eddelbuettel
Copy link
Member

I like cleanly separated paths when I do git ls (using ls = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit).

Myself, I mostly get lost with rebase. I think I did it right just once or twice. So squash would be an easy out. But if you can "graft" your few commits behind Kevin's (once I merge them in an hour or two to three) then I'd be happy in a typically nerdy type-A way that does really matter :)

Copy link
Contributor

@coatless coatless left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The #include<cassert> was commented out on the local modification. I can't remember if that was because CRAN can pick this include up on checks even if it isn't used.

Answer seems to be no:

* checking compiled code ... OK

//------------------------------------------------------------------------------
// Implementation details.
#include <algorithm>
#include <cassert>
Copy link
Contributor

@coatless coatless Dec 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could the #include<cassert> be moved to the #ifndef TINYFORMAT_ASSERT in upstream tidyformat?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krlmlr awesome!

@eddelbuettel
Copy link
Member

Merged other PR, wrapped this up a local package and started a new reverse depends check. Mine are still serial (working on that ...) so it'll be tomorrow. Plenty of time for you to rebase if you feel like it.

@eddelbuettel eddelbuettel merged commit a9d8632 into RcppCore:master Dec 21, 2017
@krlmlr krlmlr deleted the f-#786-tinyformat branch March 7, 2018 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants