Skip to content

Account for dependency renaming (utf8 changed to enc) #264

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Oct 26, 2017
Merged

Account for dependency renaming (utf8 changed to enc) #264

merged 2 commits into from
Oct 26, 2017

Conversation

lorenzwalthert
Copy link
Collaborator

@lorenzwalthert lorenzwalthert commented Oct 26, 2017 •
edited
Loading

krlmlr
krlmlr approved these changes Oct 26, 2017
View reviewed changes
DESCRIPTION Outdated
@@ -10,7 +10,7 @@ Imports:
rlang,
rprojroot,
tibble,
utf8,
enc,
Copy link
Member

Choose a reason for hiding this comment

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

Can you please keep sort order?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Sure

@lorenzwalthert lorenzwalthert force-pushed the compat-utf8-enc-renaming branch from 030bcb4 to 7e3ee56 Compare October 26, 2017 08:53
@lorenzwalthert lorenzwalthert merged commit d7dbe2d into r-lib:master Oct 26, 2017
@lorenzwalthert lorenzwalthert deleted the compat-utf8-enc-renaming branch October 26, 2017 09:07
@lorenzwalthert lorenzwalthert mentioned this pull request Oct 26, 2017
Merged
krlmlr added a commit that referenced this pull request Nov 27, 2017
@krlmlr
Merge tag 'v0.0-10'
fc85d2c 
- Adapt documentation (#290).
- Add roundtrip (#287).
- Fix AppVeyor builds.
- Fix token insertion / comment interaction (#279).
- Clarify labelling strategy (#285).
- Fixing and extending Rstudioaddins (#283).
- Fix eq assign parsing (#276).
- style_files -> vectorized style_file (#273).
- Refactoring (#270).
- Fix CI (#275).
- Fix covr (#274).
- Renaming files (#271).
- Handle styling of an unsaved active file (#243).
- Test R 3.1 and R 3.2 (#249).
- Allow empty {} without line break (#261).
- Wrap expr in expr before enclosing with curly braces (#263).
- Avoid checking for hard-coded dot (#262).
- Account for dependency renaming (utf8 changed to enc) (#264).
- Indention of function declaration and closing braces (#260).
- Only remove line break before closing with strict option (#252).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@krlmlr krlmlr krlmlr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lorenzwalthert @krlmlr