-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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
MINOR: [R] Avoid {glue}'s whitespace trimming #12770
Conversation
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.
This has been bugging me for a while too! Thanks!
I would be curious if this looks like a new bug in glue or if it's really just alignment with the documented behavior and we were relying on the not-to-spec behavior (I'm leaning towards the second option, but would love a second opinion!) |
Benchmark runs are scheduled for baseline = a1a255b and contender = a1f32fa. a1f32fa is a master commit associated with this PR. Results will be available as each benchmark for each run completes. |
For a while now glue has been removing the tabs before: (this might be from tidyverse/glue@8369f9a which was to change [a different thing we noticed with whitespace stripping](tidyverse/glue#247)). Regardless, the fix is easy enough (don't include new lines around the line we are glueing) Before the change, the format of the relevant lines of arrowExports.cpp are: ``` static const R_CallMethodDef CallEntries[] = { { "_arrow_available", (DL_FUNC)& _arrow_available, 0 }, { "_dataset_available", (DL_FUNC)& _dataset_available, 0 }, { "_engine_available", (DL_FUNC)& _engine_available, 0 }, { "_parquet_available", (DL_FUNC)& _parquet_available, 0 }, { "_s3_available", (DL_FUNC)& _s3_available, 0 }, { "_json_available", (DL_FUNC)& _json_available, 0 }, { "_arrow_test_SET_STRING_ELT", (DL_FUNC) &_arrow_test_SET_STRING_ELT, 1}, ``` When they should be: ``` static const R_CallMethodDef CallEntries[] = { { "_arrow_available", (DL_FUNC)& _arrow_available, 0 }, { "_dataset_available", (DL_FUNC)& _dataset_available, 0 }, { "_engine_available", (DL_FUNC)& _engine_available, 0 }, { "_parquet_available", (DL_FUNC)& _parquet_available, 0 }, { "_s3_available", (DL_FUNC)& _s3_available, 0 }, { "_json_available", (DL_FUNC)& _json_available, 0 }, { "_arrow_test_SET_STRING_ELT", (DL_FUNC) &_arrow_test_SET_STRING_ELT, 1}, ``` This change restores the indentation we expect there (so the file won't change on rebuilds) Closes apache#12770 from jonkeane/whitespace Authored-by: Jonathan Keane <jkeane@gmail.com> Signed-off-by: Jonathan Keane <jkeane@gmail.com>
For a while now glue has been removing the tabs before: (this might be from tidyverse/glue@8369f9a which was to change a different thing we noticed with whitespace stripping).
Regardless, the fix is easy enough (don't include new lines around the line we are glueing)
Before the change, the format of the relevant lines of arrowExports.cpp are:
When they should be:
This change restores the indentation we expect there (so the file won't change on rebuilds)