Bump requirement to R 4.1 (#745)

And use base pipe and lambda.

Author: hadley

DESCRIPTION

@@ -14,7 +14,7 @@ License: MIT + file LICENSE
 URL: https://httr2.r-lib.org, https://github.com/r-lib/httr2
 BugReports: https://github.com/r-lib/httr2/issues
 Depends:
-    R (>= 4.0)
+    R (>= 4.1)
 Imports:
     cli (>= 3.0.0),
     curl (>= 6.2.1),

R/curl.R

@@ -98,7 +98,7 @@ curl_translate <- function(cmd, simplify_headers = TRUE) {
     main_args = perform_args,
     keep_if_empty = TRUE
   )
-  out <- paste0(steps, collapse = paste0(pipe(), "\n  "))
+  out <- paste0(steps, collapse = paste0(" |>\n  "))
 
   if (clip) {
     cli::cli_alert_success("Copying to clipboard:")
@@ -109,10 +109,6 @@ curl_translate <- function(cmd, simplify_headers = TRUE) {
   structure(out, class = "httr2_cmd")
 }
 
-pipe <- function() {
-  if (getRversion() >= "4.1.0") " |> " else " %>% "
-}
-
 #' @export
 print.httr2_cmd <- function(x, ...) {
   cat(x)

R/iterate-helpers.R

@@ -83,7 +83,7 @@ iterate_with_offset <- function(
 
     if (!isTRUE(resp_complete(resp))) {
       i <<- i + offset
-      req %>% req_url_query(!!param_name := i)
+      req |> req_url_query(!!param_name := i)
     }
   }
 }
@@ -100,7 +100,7 @@ iterate_with_cursor <- function(param_name, resp_param_value) {
   function(resp, req) {
     value <- resp_param_value(resp)
     if (!is.null(value)) {
-      req %>% req_url_query(!!param_name := value)
+      req |> req_url_query(!!param_name := value)
     }
   }
 }
@@ -114,7 +114,7 @@ iterate_with_link_url <- function(rel = "next") {
   function(resp, req) {
     url <- resp_link_url(resp, rel)
     if (!is.null(url)) {
-      req %>% req_url(url)
+      req |> req_url(url)
     }
   }
 }

R/oauth-flow-auth-code.R

@@ -492,7 +492,7 @@ oauth_flow_auth_code_fetch <- function(state) {
     max_seconds = 60,
     # The endpoint may temporarily return a 404 when no code is found for a
     # given state because the user hasn't finished clicking through yet.
-    is_transient = ~ resp_status(.x) %in% c(404, 429, 503)
+    is_transient = \(resp) resp_status(resp) %in% c(404, 429, 503)
   )
   resp <- req_perform(req)
   body <- resp_body_json(resp)

R/oauth-flow.R

@@ -1,5 +1,5 @@
 oauth_flow_fetch <- function(req, source, error_call = caller_env()) {
-  req <- req_error(req, is_error = ~FALSE)
+  req <- req_error(req, is_error = \(resp) FALSE)
   resp <- req_perform(req, error_call = current_call())
 
   oauth_flow_parse(resp, source, error_call = error_call)

R/resp-headers.R

@@ -182,7 +182,7 @@ resp_link_url <- function(resp, rel) {
   link_headers <- headers[tolower(names(headers)) == "link"]
 
   links <- unlist(lapply(link_headers, parse_link), recursive = FALSE)
-  sel <- map_lgl(links, ~ .$rel == rel)
+  sel <- map_lgl(links, \(x) x$rel == rel)
   if (sum(sel) != 1L) {
     return()
   }

R/resp-status.R

@@ -16,7 +16,7 @@
 #'   `req |> req_options(followlocation = FALSE)`.
 #' * 4xx client and 5xx server errors are automatically turned into R errors.
 #'   You can stop them from being turned into R errors with [req_error()],
-#'   e.g. `req |> req_error(is_error = ~ FALSE)`.
+#'   e.g. `req |> req_error(is_error = \(resp) FALSE)`.
 #'
 #' @return
 #' * `resp_status()` returns a scalar integer