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

CHORE: Import ellipsis from rlang #554

Merged
merged 1 commit into from
Jun 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ BugReports: https://github.com/r-lib/pillar/issues
Imports:
cli (>= 2.3.0),
crayon (>= 1.3.4),
ellipsis (>= 0.3.2),
fansi,
glue,
lifecycle,
rlang (>= 1.0.1),
rlang (>= 1.0.2),
utf8 (>= 1.1.0),
utils,
vctrs (>= 0.3.8)
Expand Down
1 change: 0 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ export(tbl_format_header)
export(tbl_format_setup)
export(tbl_sum)
export(type_sum)
import(ellipsis)
import(lifecycle)
import(rlang)
importFrom(crayon,black)
Expand Down
2 changes: 1 addition & 1 deletion R/ctl_new_pillar.R
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#' Implementations should return `NULL` if none of the data
#' fits the available width.
#'
#' @inheritParams ellipsis::dots_empty
#' @inheritParams rlang::args_dots_empty
#' @param controller The object of class `"tbl"` currently printed.
#' @param x A simple (one-dimensional) vector.
#' @param width The available width, can be a vector for multiple tiers.
Expand Down
2 changes: 1 addition & 1 deletion R/ctl_pillar.R
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ pillar_from_shaft <- function(title, type, data, width) {
#' If your tibble subclass needs more or different components in its pillars,
#' override or extend [ctl_new_pillar()] and perhaps [ctl_new_pillar_list()].
#'
#' @inheritParams ellipsis::dots_empty
#' @inheritParams rlang::args_dots_empty
#' @inheritParams pillar
#' @param components A named list of components constructed with [pillar_component()].
#' @param class Name of subclass.
Expand Down
2 changes: 1 addition & 1 deletion R/ctl_pillar_component.R
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#' Compound columns are represented by multiple pillar objects, each with their
#' own components.
#'
#' @inheritParams ellipsis::dots_empty
#' @inheritParams rlang::args_dots_empty
#' @param x A bare list of length one (for `new_pillar_component()`),
#' or an object with `"width"` and `"min_width"` attributes
#' (for `pillar_component()`).
Expand Down
2 changes: 1 addition & 1 deletion R/glimpse.R
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ glimpse.default <- function(x, width = NULL, max.level = 3, ...) {
#' Empty vectors are shown as `<>`.
#'
#' @return A character vector of the same length as `x`.
#' @inheritParams ellipsis::dots_used
#' @inheritParams rlang::args_dots_used
#' @param x A vector.
#' @export
#' @examples
Expand Down
4 changes: 2 additions & 2 deletions R/multi.R
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#' @param has_row_id Include a column indicating row IDs? Pass `"*"` to mark
#' the row ID column with a star.
#' @param width Default width of the entire output, optional.
#' @inheritParams ellipsis::dots_empty
#' @inheritParams rlang::args_dots_empty
#' @keywords internal
#' @export
colonnade <- function(x, has_row_id = TRUE, width = NULL, ...) {
Expand Down Expand Up @@ -228,7 +228,7 @@ knit_print_squeezed_colonnade_tier <- function(x) {
#' describes each of the omitted columns.
#'
#' @param x The result of [squeeze()] on a [colonnade] object
#' @inheritParams ellipsis::dots_used
#' @inheritParams rlang::args_dots_used
#' @keywords internal
#' @export
extra_cols <- function(x, ...) {
Expand Down
2 changes: 1 addition & 1 deletion R/shaft-.R
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ new_pillar_shaft <- function(x, ..., width = NULL, min_width = width,
#' for your data type to display it in a tibble.
#'
#' @param x A vector to format
#' @inheritParams ellipsis::dots_used
#' @inheritParams rlang::args_dots_used
#' @export
#' @examples
#' pillar_shaft(1:3)
Expand Down
2 changes: 1 addition & 1 deletion R/tbl-format-body.R
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#' If you only need to change the appearance of a single data type,
#' override [vctrs::vec_ptype_abbr()] and [pillar_shaft()] for this data type.
#'
#' @inheritParams ellipsis::dots_empty
#' @inheritParams rlang::args_dots_empty
#' @param x A tibble-like object.
#' @param setup A setup object returned from [tbl_format_setup()].
#'
Expand Down
2 changes: 1 addition & 1 deletion R/title.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ style_title <- style_bold
#' Call [format()] on the result to render column titles.
#'
#' @param x A character vector of column titles.
#' @inheritParams ellipsis::dots_empty
#' @inheritParams rlang::args_dots_empty
#' @export
#' @examples
#' format(new_pillar_title(names(trees)))
Expand Down
4 changes: 2 additions & 2 deletions R/type.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ style_type <- function(x) {
#' Call [format()] on the result to render column types.
#'
#' @param x A vector for which the type is to be retrieved.
#' @inheritParams ellipsis::dots_empty
#' @inheritParams rlang::args_dots_empty
#' @export
#' @examples
#' format(new_pillar_type("a"))
Expand Down Expand Up @@ -71,7 +71,7 @@ format_full_pillar_type <- function(x) {
#' @param x A return value from `type_sum()`
#' @param width The desired total width. If the returned string still is
#' wider, it will be trimmed. Can be `NULL`.
#' @inheritParams ellipsis::dots_used
#' @inheritParams rlang::args_dots_used
#'
#' @export
#' @examples
Expand Down
1 change: 0 additions & 1 deletion R/zzz.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# nocov start - zzz.R

#' @import rlang
#' @import ellipsis
#' @import lifecycle
#' @importFrom glue as_glue
#' @importFrom vctrs data_frame
Expand Down