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

#4173 lambda functions in discrete scales & facets #4188

Merged
merged 7 commits into from
May 7, 2021

Conversation

netique
Copy link
Contributor

@netique netique commented Sep 3, 2020

Fix #4173

second PR, previous one was failing tests... now it should work as intended

@clauswilke
Copy link
Member

In the future, please don't open a new PR just because something needs correcting in the previous PR. You can just push additional commits and the PR will update.

R/labeller.r Outdated Show resolved Hide resolved
@thomasp85 thomasp85 added this to the ggplot2 3.3.4 milestone Mar 25, 2021
R/labeller.r Show resolved Hide resolved
@thomasp85
Copy link
Member

@netique We recently merged in another PR that touched upon some of the same areas - can I get you to update this PR so it incorporates the changes in the master branch?

@netique
Copy link
Contributor Author

netique commented May 6, 2021

@netique We recently merged in another PR that touched upon some of the same areas - can I get you to update this PR so it incorporates the changes in the master branch?

Sure, done.

R/scale-.r Outdated
@@ -184,6 +184,7 @@ discrete_scale <- function(aesthetics, scale_name, palette, name = waiver(),

check_breaks_labels(breaks, labels)

if (is.formula(labels)) labels <- as_function(labels)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Sorry this is mostly my fault for getting in your way with #4427, but the allow_lambda() statements below already capture formulas as functions, so this line has become unnecessary. Apologies!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's OK, thank you for your contribution. In the up-to-date commit, the line is removed. I accidentally retained both solutions during the merge conflict resolution.

R/labeller.r Outdated
Comment on lines 438 to 441

dots <- list(...)


Copy link
Member

Choose a reason for hiding this comment

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

Can I get you to revert these superfluous changed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My apologies. Fixed in 6d488b6.

Copy link
Member

Choose a reason for hiding this comment

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

No apology needed - thanks for your work on this

@thomasp85
Copy link
Member

Last thing - can I get you to add a news bullet about the change

@thomasp85 thomasp85 merged commit 6f6a8ba into tidyverse:master May 7, 2021
@thomasp85
Copy link
Member

Thanks!

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.

Allow passing arguments to the custom labelling functions
4 participants