refactor: minor clean-up

Author: m-muecke

R/interest-rate.R

@@ -25,8 +25,7 @@ tr_yield_curve <- function(date = NULL) {
   if (is.null(dt)) {
     return()
   }
-  dt <- clean_yield_curve(dt)
-  dt
+  clean_yield_curve(dt)
 }
 
 parse_yield_curve <- function(x) {
@@ -82,8 +81,7 @@ tr_bill_rates <- function(date = NULL) {
   if (is.null(dt)) {
     return()
   }
-  dt <- clean_bill_rates(dt)
-  dt
+  clean_bill_rates(dt)
 }
 
 parse_bill_rates <- function(x) {
@@ -103,8 +101,8 @@ clean_bill_rates <- function(dt) {
   dt[, type := gsub("round_b1_", "", tolower(type), fixed = TRUE)]
   dt[, type := gsub("_2$", "", type)]
   dt[, maturity := strsplit(type, "_", fixed = TRUE)]
-  dt[, type := vapply(maturity, `[[`, NA_character_, 1L)]
-  dt[, maturity := vapply(maturity, `[[`, NA_character_, 2L)]
+  dt[, type := vapply(maturity, `[[`, "", 1L)]
+  dt[, maturity := vapply(maturity, `[[`, "", 2L)]
   dt[, maturity := gsub("wk", " weeks", maturity, fixed = TRUE)]
   dt[, c("date", "type", "maturity", "value")]
 }
@@ -134,8 +132,7 @@ tr_long_term_rate <- function(date = NULL) {
   if (is.null(dt)) {
     return()
   }
-  dt <- clean_long_term_rate(dt)
-  dt
+  clean_long_term_rate(dt)
 }
 
 parse_long_term_rate <- function(x) {
@@ -176,16 +173,15 @@ clean_long_term_rate <- function(dt) {
 #' \donttest{
 #' # get data for a single month
 #' tr_real_yield_curve("202201")
-#' # or for the entire year
 #' tr_real_yield_curve(2022)
+#' # or for the entire year
 #' }
 tr_real_yield_curve <- function(date = NULL) {
   dt <- treasury("daily_treasury_real_yield_curve", date, parse_real_yield_curve)
   if (is.null(dt)) {
     return()
   }
-  dt <- clean_real_yield_curves(dt)
-  dt
+  clean_real_yield_curves(dt)
 }
 
 parse_real_yield_curve <- function(x) {

R/yield-curve.R

@@ -43,7 +43,7 @@ tr_curve_rate <- function(
   type <- match.arg(type)
   start_year <- switch(x, hqm = 1984L, tnc = 1978L, trc = 2003L, tbi = 2003L)
   x <- if (type == "monthly") x else paste0(x, "eom")
-  years <- seq.int(start_year, 2027L, by = 5L)
+  years <- seq(start_year, 2027L, by = 5L)
   if (!is.null(year)) {
     years <- years[findInterval(year, years)]
   }
@@ -58,7 +58,7 @@ tr_curve_rate <- function(
         if (year >= 2023L && !startsWith(x, "hqm")) "xlsx" else "xls"
       )
     },
-    NA_character_
+    ""
   )
   if (x == "hqmeom") {
     urls <- sub("88\\.xls$", "88_0.xls", urls)
@@ -75,8 +75,8 @@ tr_curve_rate <- function(
       nms <- paste(months, years, sep = "-")
       nms <- c("maturity", "tmp", nms)
       nms
-    }) |>
-      setDT()
+    })
+    dt <- setDT(dt)
     dt[, 2L := NULL]
     dt[, names(.SD) := lapply(.SD, as.numeric), .SDcols = is.logical]
     dt <- melt(
@@ -165,8 +165,8 @@ download_data <- function(x, col_names, skip, names_to, values_to) {
   tf <- tempfile()
   on.exit(unlink(tf), add = TRUE)
   utils::download.file(url, destfile = tf, quiet = TRUE, mode = "wb")
-  dt <- readxl::read_excel(tf, col_names = col_names, skip = skip) |>
-    setDT()
+  dt <- readxl::read_excel(tf, col_names = col_names, skip = skip)
+  dt <- setDT(dt)
   dt[, 2L := NULL]
   dt <- melt(
     dt,