Skip to content

Commit 0335fbe

Browse files
committed
used rlang bulleted error messages
* remove paste_inline()
1 parent e08aa01 commit 0335fbe

File tree

4 files changed

+23
-26
lines changed

4 files changed

+23
-26
lines changed

R/as-tsibble.R

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -418,10 +418,10 @@ validate_index_order <- function(data, key_data, index) {
418418
if (!ordered) {
419419
idx_txt <- backticks(index)
420420
key_txt <- backticks(head(names(key_data), -1L))
421-
warn(sprintf(paste_inline(
421+
warn(c(
422422
"Current temporal ordering may yield unexpected results.",
423-
"Suggest to sort by %s first."
424-
), comma(c(key_txt, idx_txt), sep = "")))
423+
i = sprintf("Suggest to sort by %s first.", comma(c(key_txt, idx_txt), sep = ""))
424+
))
425425
}
426426
ordered
427427
}
@@ -440,9 +440,9 @@ validate_interval <- function(data, key_data, index, interval) {
440440
abort(sprintf(msg_interval, class(interval)[1]))
441441
}
442442
if (unknown_interval(interval) && (nrows > vec_size(key_data))) {
443-
abort(paste_inline(
443+
abort(c(
444444
"Can't obtain the interval due to the mismatched index class.",
445-
"Please see `vignette(\"FAQ\")` for details."
445+
i = "Please see `vignette(\"FAQ\")` for details."
446446
))
447447
}
448448
interval
@@ -453,9 +453,9 @@ validate_interval <- function(data, key_data, index, interval) {
453453
validate_tsibble <- function(data, key, index, key_data = NULL) {
454454
is_dup <- duplicated_key_index(data, key, index, key_data)
455455
if (is_dup) {
456-
header <- "A valid tsibble must have distinct rows identified by key and index."
457-
hint <- "Please use `duplicates()` to check the duplicated rows."
458-
abort(paste_inline(header, hint))
456+
abort(c(
457+
"A valid tsibble must have distinct rows identified by key and index.",
458+
i = "Please use `duplicates()` to check the duplicated rows."))
459459
}
460460
data
461461
}
@@ -464,9 +464,9 @@ validate_tsibble <- function(data, key, index, key_data = NULL) {
464464
retain_tsibble <- function(data, key, index) {
465465
is_dup <- duplicated_key_index(data, key, index)
466466
if (is_dup) {
467-
header <- "The result is not a valid tsibble."
468-
hint <- "Do you need `as_tibble()` to work with data frame?"
469-
abort(paste_inline(header, hint))
467+
abort(c(
468+
"The result is not a valid tsibble.",
469+
i = "Do you need `as_tibble()` to work with data frame?"))
470470
}
471471
data
472472
}
@@ -475,7 +475,9 @@ retain_tsibble <- function(data, key, index) {
475475
format.tbl_ts <- function(x, ..., n = NULL, width = NULL, n_extra = NULL) {
476476
is_index_null(x)
477477
if (!is_null(x %@% "regular") || !is_null(x %@% "ordered")) {
478-
warn("`.data`. is a corrupt tsibble object, please reconstruct with `as_tsibble()`.")
478+
warn(c(
479+
"`.data`. is a corrupt tsibble object.",
480+
i = "Please reconstruct with `as_tsibble()`."))
479481
}
480482
format(trunc_mat(x, n = n, width = width, n_extra = n_extra))
481483
}

R/dplyr-verbs.R

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ group_by.tbl_ts <- function(.data, ..., .add = FALSE,
133133

134134
index <- index_var(.data)
135135
if (index %in% grp_vars) {
136-
err <- sprintf("Column `%s` (index) can't be a grouping variable for a tsibble.", index)
137-
hint <- "Did you mean `index_by()`?"
138-
abort(paste_inline(err, hint))
136+
abort(c(
137+
sprintf("Column `%s` (index) can't be a grouping variable for a tsibble.", index),
138+
i = "Did you mean `index_by()`?"))
139139
}
140140

141141
grp_key <- identical(grp_vars, key_vars(.data)) &&
@@ -211,10 +211,9 @@ dplyr_col_modify.tbl_ts <- function(data, cols) {
211211
res <- dplyr_col_modify(as_tibble(data), cols)
212212
idx_chr <- index_var(data)
213213
if (is_false(idx_chr %in% names(res))) { # index has been removed
214-
abort(sprintf(paste_inline(
214+
abort(c(
215215
"Column `%s` (index) can't be removed for a tsibble.",
216-
"Do you need `as_tibble()` to work with data frame?"
217-
), idx_chr))
216+
i = sprintf("Do you need `as_tibble()` to work with data frame?"), idx_chr))
218217
}
219218

220219
vec_names <- names(cols)

R/tidyr-verbs.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ pivot_longer.tbl_ts <- function(data, cols, names_to = "name", ...) {
3434
pivot_wider.tbl_ts <- function(data, id_cols = NULL, names_from = name, ...) {
3535
key_var <- vars_pull(names(data), !!enquo(names_from))
3636
if (has_index(key_var, data)) {
37-
abort(paste_inline(
37+
abort(c(
3838
sprintf("Column `%s` (index) can't be spread.", key_var),
39-
"Please use `as_tibble()` to coerce."
39+
i = "Please use `as_tibble()` to coerce."
4040
))
4141
}
4242
key_left <- setdiff(key_vars(data), key_var)
@@ -86,9 +86,9 @@ spread.tbl_ts <- function(data, key, value, ...) {
8686
value <- enexpr(value)
8787
key_var <- vars_pull(names(data), !!key)
8888
if (has_index(key_var, data)) {
89-
abort(paste_inline(
89+
abort(c(
9090
sprintf("Column `%s` (index) can't be spread.", key_var),
91-
"Please use `as_tibble()` to coerce."
91+
i = "Please use `as_tibble()` to coerce."
9292
))
9393
}
9494
key_left <- setdiff(key_vars(data), key_var)

R/utils.R

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ cat_line <- function(...) {
3131
cat(paste0(..., "\n"), sep = "")
3232
}
3333

34-
paste_inline <- function(...) {
35-
paste(..., sep = "\n")
36-
}
37-
3834
dim_tbl_ts <- function(x) {
3935
dim_x <- dim(x)
4036
format_dim <- map_chr(dim_x, big_mark)

0 commit comments

Comments
 (0)