Tweak error message

Author: DavisVaughan

R/pack.R

@@ -178,14 +178,14 @@ check_inner_inner_duplicate <- function(x, error_call = caller_env()) {
   outers <- split$val
 
   bullets <- map2_chr(inners, outers, function(inner, outer) {
-    cli::format_inline("{.code {inner}}, across {.code {outer}}.")
+    cli::format_inline("{.code {inner}}, within {.code {outer}}.")
   })
   bullets <- set_names(bullets, "i")
   bullets <- cli::format_bullets_raw(bullets)
   bullets <- set_names(bullets, " ")
 
   message <- c(
-    "Can't duplicate names across the modified columns.",
+    "Can't duplicate names within the affected columns.",
     x = "These names are duplicated:",
     bullets,
     i = "Use `names_sep` to disambiguate using the column name.",
@@ -217,7 +217,7 @@ check_outer_inner_duplicate <- function(x, outer, error_call = caller_env()) {
   bullets <- set_names(bullets, " ")
 
   message <- c(
-    "Can't duplicate names between the modified columns and the original data.",
+    "Can't duplicate names between the affected columns and the original data.",
     x = "These names are duplicated:",
     bullets,
     i = "Use `names_sep` to disambiguate using the column name.",

tests/testthat/_snaps/pack.md

@@ -27,9 +27,9 @@
       unpack(df, c(x, y))
     Condition
       Error in `unpack()`:
-      ! Can't duplicate names across the modified columns.
+      ! Can't duplicate names within the affected columns.
       x These names are duplicated:
-        i `b`, across `x` and `y`.
+        i `b`, within `x` and `y`.
       i Use `names_sep` to disambiguate using the column name.
       i Or use `names_repair` to specify a repair strategy.
 
@@ -39,10 +39,10 @@
       unpack(df, c(x, y, z))
     Condition
       Error in `unpack()`:
-      ! Can't duplicate names across the modified columns.
+      ! Can't duplicate names within the affected columns.
       x These names are duplicated:
-        i `a`, across `x` and `z`.
-        i `b`, across `x`, `y`, and `z`.
+        i `a`, within `x` and `z`.
+        i `b`, within `x`, `y`, and `z`.
       i Use `names_sep` to disambiguate using the column name.
       i Or use `names_repair` to specify a repair strategy.
 
@@ -52,7 +52,7 @@
       unpack(df, d)
     Condition
       Error in `unpack()`:
-      ! Can't duplicate names between the modified columns and the original data.
+      ! Can't duplicate names between the affected columns and the original data.
       x These names are duplicated:
         i `a`, from `d`.
       i Use `names_sep` to disambiguate using the column name.
@@ -64,7 +64,7 @@
       unpack(df, c(d, e, f))
     Condition
       Error in `unpack()`:
-      ! Can't duplicate names between the modified columns and the original data.
+      ! Can't duplicate names between the affected columns and the original data.
       x These names are duplicated:
         i `a`, from `d`.
         i `b` and `c`, from `f`.

tests/testthat/_snaps/separate-wider.md

@@ -149,7 +149,7 @@
       separate_wider_regex(df, y, patterns = c(x = ".", value = "."))
     Condition
       Error in `unpack()`:
-      ! Can't duplicate names between the modified columns and the original data.
+      ! Can't duplicate names between the affected columns and the original data.
       x These names are duplicated:
         i `x`, from `y`.
       i Use `names_sep` to disambiguate using the column name.
@@ -161,10 +161,10 @@
       separate_wider_regex(df, c(x, y), patterns = c(gender = ".", value = "."))
     Condition
       Error in `unpack()`:
-      ! Can't duplicate names across the modified columns.
+      ! Can't duplicate names within the affected columns.
       x These names are duplicated:
-        i `gender`, across `x` and `y`.
-        i `value`, across `x` and `y`.
+        i `gender`, within `x` and `y`.
+        i `value`, within `x` and `y`.
       i Use `names_sep` to disambiguate using the column name.
       i Or use `names_repair` to specify a repair strategy.
 

tests/testthat/_snaps/unnest-wider.md

@@ -58,7 +58,7 @@
       unnest_wider(df, y)
     Condition
       Error in `unpack()`:
-      ! Can't duplicate names between the modified columns and the original data.
+      ! Can't duplicate names between the affected columns and the original data.
       x These names are duplicated:
         i `x`, from `y`.
       i Use `names_sep` to disambiguate using the column name.
@@ -70,9 +70,9 @@
       unnest_wider(df, c(y, z))
     Condition
       Error in `unpack()`:
-      ! Can't duplicate names across the modified columns.
+      ! Can't duplicate names within the affected columns.
       x These names are duplicated:
-        i `a`, across `y` and `z`.
+        i `a`, within `y` and `z`.
       i Use `names_sep` to disambiguate using the column name.
       i Or use `names_repair` to specify a repair strategy.
 

tests/testthat/_snaps/unnest.md

@@ -40,7 +40,7 @@
       unnest(df, y)
     Condition
       Error in `unpack()`:
-      ! Can't duplicate names between the modified columns and the original data.
+      ! Can't duplicate names between the affected columns and the original data.
       x These names are duplicated:
         i `x`, from `y`.
       i Use `names_sep` to disambiguate using the column name.
@@ -52,9 +52,9 @@
       unnest(df, c(x, y))
     Condition
       Error in `unpack()`:
-      ! Can't duplicate names across the modified columns.
+      ! Can't duplicate names within the affected columns.
       x These names are duplicated:
-        i `a`, across `x` and `y`.
+        i `a`, within `x` and `y`.
       i Use `names_sep` to disambiguate using the column name.
       i Or use `names_repair` to specify a repair strategy.