Optimize get_class() function

ropensci · May 23, 2021 · c404b07 · c404b07
1 parent fbaf698
commit c404b07
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/R/utils.R b/R/utils.R
@@ -284,12 +284,8 @@ na_as <- function(x) {
 }
 
 get_class <- function(x) {
-    foo <- function(x) {
-        class(x)[1]
-    }
-
-    if (is.list(x) || is.data.frame(x)) {
-        vapply(x, foo, character(1))
+    if (is.list(x)) {
+        vapply(x, function(x) class(x)[1], character(1))
     } else {
         class(x)[1]
     }

diff --git a/tests/testthat/test-utils.R b/tests/testthat/test-utils.R
@@ -338,17 +338,13 @@ test_that("na_as() | general test", {
 })
 
 test_that("get_class() | general test", {
-    foo <- function(x) {
-        class(x)[1]
-    }
+    test <- function(x) class(x)[1]
 
     expect_equal(get_class(1), "numeric")
-
-    x <- datasets::iris
-    expect_equal(get_class(x), vapply(x, foo, character(1)))
-
-    x <- list(a = 1, b = 1)
-    expect_equal(get_class(x), vapply(x, foo, character(1)))
+    expect_equal(get_class(datasets::iris),
+                 vapply(datasets::iris, test, character(1)))
+    expect_equal(get_class(list(a = 1, b = 1)),
+                 vapply(list(a = 1, b = 1), test, character(1)))
 })
 
 test_that("fix_character() | general test", {