Skip to content

Commit 51309dd

Browse files
committed
rename check_number_decimal to check_number
1 parent 150d522 commit 51309dd

File tree

3 files changed

+40
-39
lines changed

3 files changed

+40
-39
lines changed

R/standalone-types-check.R

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ---
22
# repo: r-lib/rlang
33
# file: standalone-types-check.R
4-
# last-updated: 2023-03-13
4+
# last-updated: 2025-09-19
55
# license: https://unlicense.org
66
# dependencies: standalone-obj-type.R
77
# imports: rlang (>= 1.1.0)
@@ -11,6 +11,7 @@
1111
#
1212
# 2025-09-19:
1313
# - `check_logical()` gains an `allow_na` argument (@jonthegeek, #1724)
14+
# - Rename `check_number_decimal()` to `check_number()` (@khusmann, #1714)
1415
#
1516
# 2024-08-15:
1617
# - `check_character()` gains an `allow_na` argument (@martaalcalde, #1724)
@@ -178,7 +179,7 @@ IS_NUMBER_true <- 0
178179
IS_NUMBER_false <- 1
179180
IS_NUMBER_oob <- 2
180181

181-
check_number_decimal <- function(
182+
check_number <- function(
182183
x,
183184
...,
184185
min = NULL,

tests/testthat/_snaps/standalone-types-check.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -244,76 +244,76 @@
244244
Error in `check()`:
245245
! `max` must be a number, not missing.
246246

247-
# `check_number_decimal()` checks
247+
# `check_number()` checks
248248

249249
Code
250-
err(checker(, check_number_decimal))
250+
err(checker(, check_number))
251251
Output
252252
<error/rlang_error>
253253
Error in `checker()`:
254254
! `foo` must be a number, not absent.
255255
Code
256-
err(checker(NA, check_number_decimal))
256+
err(checker(NA, check_number))
257257
Output
258258
<error/rlang_error>
259259
Error in `checker()`:
260260
! `foo` must be a number, not `NA`.
261261
Code
262-
err(checker(NULL, check_number_decimal))
262+
err(checker(NULL, check_number))
263263
Output
264264
<error/rlang_error>
265265
Error in `checker()`:
266266
! `foo` must be a number, not `NULL`.
267267
Code
268-
err(checker(int(), check_number_decimal, allow_na = TRUE))
268+
err(checker(int(), check_number, allow_na = TRUE))
269269
Output
270270
<error/rlang_error>
271271
Error in `checker()`:
272272
! `foo` must be a number or `NA`, not an empty integer vector.
273273
Code
274-
err(checker(na_dbl, check_number_decimal))
274+
err(checker(na_dbl, check_number))
275275
Output
276276
<error/rlang_error>
277277
Error in `checker()`:
278278
! `foo` must be a number, not a numeric `NA`.
279279
Code
280-
err(checker(na_int, check_number_decimal))
280+
err(checker(na_int, check_number))
281281
Output
282282
<error/rlang_error>
283283
Error in `checker()`:
284284
! `foo` must be a number, not an integer `NA`.
285285
Code
286-
err(checker(10:11, check_number_decimal, allow_na = TRUE, allow_null = TRUE))
286+
err(checker(10:11, check_number, allow_na = TRUE, allow_null = TRUE))
287287
Output
288288
<error/rlang_error>
289289
Error in `checker()`:
290290
! `foo` must be a number, `NA`, or `NULL`, not an integer vector.
291291
Code
292-
err(checker(Inf, check_number_decimal, allow_infinite = FALSE))
292+
err(checker(Inf, check_number, allow_infinite = FALSE))
293293
Output
294294
<error/rlang_error>
295295
Error in `checker()`:
296296
! `foo` must be a number, not `Inf`.
297297
Code
298-
err(checker(-Inf, check_number_decimal, allow_infinite = FALSE))
298+
err(checker(-Inf, check_number, allow_infinite = FALSE))
299299
Output
300300
<error/rlang_error>
301301
Error in `checker()`:
302302
! `foo` must be a number, not `-Inf`.
303303
Code
304-
err(checker(10, min = NA, check_number_decimal))
304+
err(checker(10, min = NA, check_number))
305305
Output
306306
<error/rlang_error>
307307
Error in `check()`:
308308
! `min` must be a single double value.
309309
Code
310-
err(checker(10, min = NaN, check_number_decimal))
310+
err(checker(10, min = NaN, check_number))
311311
Output
312312
<error/rlang_error>
313313
Error in `check()`:
314314
! `min` must be a number, not missing.
315315
Code
316-
err(checker(10, max = NaN, check_number_decimal))
316+
err(checker(10, max = NaN, check_number))
317317
Output
318318
<error/rlang_error>
319319
Error in `check()`:
@@ -505,7 +505,7 @@
505505
Error:
506506
! `factor("a")` must be a whole number, not a <factor> object.
507507
Code
508-
(expect_error(check_number_decimal(as.Date("2000-01-01"))))
508+
(expect_error(check_number(as.Date("2000-01-01"))))
509509
Output
510510
<error/rlang_error>
511511
Error:

tests/testthat/test-standalone-types-check.R

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -84,35 +84,35 @@ test_that("`check_number_whole()` checks", {
8484
})
8585
})
8686

87-
test_that("`check_number_decimal()` checks", {
88-
expect_null(check_number_decimal(10))
89-
expect_null(check_number_decimal(10L))
90-
expect_null(check_number_decimal(10.5))
91-
expect_null(check_number_decimal(NA, allow_na = TRUE))
92-
expect_null(check_number_decimal(na_dbl, allow_na = TRUE))
93-
expect_null(check_number_decimal(na_int, allow_na = TRUE))
94-
expect_null(check_number_decimal(NULL, allow_null = TRUE))
95-
expect_null(check_number_decimal(Inf))
96-
expect_null(check_number_decimal(-Inf))
87+
test_that("`check_number()` checks", {
88+
expect_null(check_number(10))
89+
expect_null(check_number(10L))
90+
expect_null(check_number(10.5))
91+
expect_null(check_number(NA, allow_na = TRUE))
92+
expect_null(check_number(na_dbl, allow_na = TRUE))
93+
expect_null(check_number(na_int, allow_na = TRUE))
94+
expect_null(check_number(NULL, allow_null = TRUE))
95+
expect_null(check_number(Inf))
96+
expect_null(check_number(-Inf))
9797

9898
expect_snapshot({
99-
err(checker(, check_number_decimal))
100-
err(checker(NA, check_number_decimal))
101-
err(checker(NULL, check_number_decimal))
102-
err(checker(int(), check_number_decimal, allow_na = TRUE))
103-
err(checker(na_dbl, check_number_decimal))
104-
err(checker(na_int, check_number_decimal))
99+
err(checker(, check_number))
100+
err(checker(NA, check_number))
101+
err(checker(NULL, check_number))
102+
err(checker(int(), check_number, allow_na = TRUE))
103+
err(checker(na_dbl, check_number))
104+
err(checker(na_int, check_number))
105105
err(checker(
106106
10:11,
107-
check_number_decimal,
107+
check_number,
108108
allow_na = TRUE,
109109
allow_null = TRUE
110110
))
111-
err(checker(Inf, check_number_decimal, allow_infinite = FALSE))
112-
err(checker(-Inf, check_number_decimal, allow_infinite = FALSE))
113-
err(checker(10, min = NA, check_number_decimal))
114-
err(checker(10, min = NaN, check_number_decimal))
115-
err(checker(10, max = NaN, check_number_decimal))
111+
err(checker(Inf, check_number, allow_infinite = FALSE))
112+
err(checker(-Inf, check_number, allow_infinite = FALSE))
113+
err(checker(10, min = NA, check_number))
114+
err(checker(10, min = NaN, check_number))
115+
err(checker(10, max = NaN, check_number))
116116
})
117117
})
118118

@@ -195,7 +195,7 @@ test_that("`check_logical()` checks", {
195195
test_that("non-numeric types are not numbers", {
196196
expect_snapshot({
197197
(expect_error(check_number_whole(factor("a"))))
198-
(expect_error(check_number_decimal(as.Date("2000-01-01"))))
198+
(expect_error(check_number(as.Date("2000-01-01"))))
199199
})
200200
})
201201

0 commit comments

Comments
 (0)