GH-50495: [R] 25.0.0 Release followups (#50786)

### Rationale for this change

Changes from release branch need porting to main

### What changes are included in this PR?

Port them to main

### Are these changes tested?

No

### Are there any user-facing changes?

Sure, we removed two defunct funcs

* GitHub Issue: #50495

Authored-by: Nic Crane <thisisnic@gmail.com>
Signed-off-by: Nic Crane <thisisnic@gmail.com>

r/NAMESPACE

@@ -279,7 +279,6 @@ export(Type)
 export(UnionDataset)
 export(all_of)
 export(arrow_array)
-export(arrow_available)
 export(arrow_info)
 export(arrow_table)
 export(arrow_with_acero)
@@ -406,7 +405,6 @@ export(time64)
 export(timestamp)
 export(to_arrow)
 export(to_duckdb)
-export(type)
 export(uint16)
 export(uint32)
 export(uint64)

r/R/arrow-info.R

@@ -74,12 +74,6 @@ arrow_info <- function() {
   structure(out, class = "arrow_info")
 }
 
-#' @rdname arrow_info
-#' @export
-arrow_available <- function() {
-  .Deprecated(msg = "Arrow C++ is always available as of 7.0.0")
-  TRUE
-}
 
 #' @rdname arrow_info
 #' @export

r/R/dataset-format.R

@@ -144,7 +144,6 @@ IpcFileFormat <- R6Class("IpcFileFormat", inherit = FileFormat)
 #' @rdname JsonFileFormat
 #' @name JsonFileFormat
 #' @seealso [FileFormat]
-#' @examplesIf arrow_with_dataset()
 #'
 #' @export
 JsonFileFormat <- R6Class("JsonFileFormat", inherit = FileFormat)

r/R/dplyr-funcs-doc.R

@@ -100,24 +100,24 @@
 #'
 #' ## base
 #'
-#' * [`!`][!()]
-#' * [`!=`][!=()]
-#' * [`%%`][%%()]
-#' * [`%/%`][%/%()]
-#' * [`%in%`][%in%()]
-#' * [`&`][&()]
-#' * [`*`][*()]
-#' * [`+`][+()]
-#' * [`-`][-()]
-#' * [`/`][/()]
-#' * [`<`][<()]
-#' * [`<=`][<=()]
-#' * [`==`][==()]
-#' * [`>`][>()]
-#' * [`>=`][>=()]
+#' * [`!`][base::!()]
+#' * [`!=`][base::!=()]
+#' * [`%%`][base::%%()]
+#' * [`%/%`][base::%/%()]
+#' * [`%in%`][base::%in%()]
+#' * [`&`][base::&()]
+#' * [`*`][base::*()]
+#' * [`+`][base::+()]
+#' * [`-`][base::-()]
+#' * [`/`][base::/()]
+#' * [`<`][base::<()]
+#' * [`<=`][base::<=()]
+#' * [`==`][base::==()]
+#' * [`>`][base::>()]
+#' * [`>=`][base::>=()]
 #' * [`ISOdate()`][base::ISOdate()]
 #' * [`ISOdatetime()`][base::ISOdatetime()]
-#' * [`^`][^()]
+#' * [`^`][base::^()]
 #' * [`abs()`][base::abs()]
 #' * [`acos()`][base::acos()]
 #' * [`acosh()`][base::acosh()]
@@ -195,7 +195,7 @@
 #' * [`tolower()`][base::tolower()]
 #' * [`toupper()`][base::toupper()]
 #' * [`trunc()`][base::trunc()]
-#' * [`|`][|()]
+#' * [`|`][base::|()]
 #'
 #' ## bit64
 #'

r/R/filesystem.R

@@ -282,6 +282,9 @@ FileSelector$create <- function(base_dir, allow_not_found = FALSE, recursive = F
 #' `AzureDefaultCredential` for authentication, so that several authentication
 #' types are tried until one succeeds.
 #'
+#' `AzureFileSystem` is not presently supported on Windows due to upstream
+#' compatibility issues between the Azure C++ SDK and the MinGW toolchain.
+#'
 #' @usage NULL
 #' @format NULL
 #' @docType class

r/R/type.R

@@ -69,8 +69,6 @@ FLOAT_TYPES <- c("float16", "float32", "float64", "halffloat", "float", "double"
 
 #' Infer the arrow Array type from an R object
 #'
-#' [type()] is deprecated in favor of [infer_type()].
-#'
 #' @param x an R object (usually a vector) to be converted to an [Array] or
 #'   [ChunkedArray].
 #' @param ... Passed to S3 methods
@@ -88,12 +86,6 @@ FLOAT_TYPES <- c("float16", "float32", "float64", "halffloat", "float", "double"
 #' @export
 infer_type <- function(x, ...) UseMethod("infer_type")
 
-#' @rdname infer_type
-#' @export
-type <- function(x) {
-  .Deprecated("infer_type")
-  infer_type(x)
-}
 
 #' @export
 infer_type.default <- function(x, ..., from_array_infer_type = FALSE) {

r/data-raw/docgen.R

@@ -101,10 +101,16 @@ render_fun <- function(fun, pkg_fun, notes) {
   # Make it \code{} for better formatting
   fun <- paste0("`", fun, "`")
   # Wrap in \link{}
+  # Operators need base:: prefix to disambiguate from other packages (e.g. bit64)
+  link_target <- ifelse(
+    !not_operators & !grepl("::", pkg_fun),
+    paste0("base::", pkg_fun),
+    pkg_fun
+  )
   out <- ifelse(
     pkg_fun %in% do_not_link,
     fun,
-    paste0("[", fun, "][", pkg_fun, "()]")
+    paste0("[", fun, "][", link_target, "()]")
   )
   # Add notes after :, if exist
   has_notes <- nzchar(notes)

r/man/FileSystem.Rd

@@ -194,7 +194,7 @@ On \code{AzureFileSystem}, passing no arguments for authentication uses the
 \code{AzureDefaultCredential} for authentication, so that several authentication
 types are tried until one succeeds.
 
-\code{AzureFileSystem} is not presently supported on Windows due to upstream compatibility
-issues between the Azure C++ SDK and the MinGW toolchain.
+\code{AzureFileSystem} is not presently supported on Windows due to upstream
+compatibility issues between the Azure C++ SDK and the MinGW toolchain.
 }
 

r/man/acero.Rd

@@ -72,7 +72,7 @@ can assume that the function works in Acero just as it does in R.
 Functions can be called either as \code{pkg::fun()} or just \code{fun()}, i.e. both
 \code{str_sub()} and \code{stringr::str_sub()} work.
 
-In addition to these functions, you can call any of Arrow's 281 compute
+In addition to these functions, you can call any of Arrow's 254 compute
 functions directly. Arrow has many functions that don't map to an existing R
 function. In other cases where there is an R function mapping, you can still
 call the Arrow function directly if you don't want the adaptations that the R
@@ -89,24 +89,24 @@ as \code{arrow_ascii_is_decimal}.
 
 \subsection{base}{
 \itemize{
-\item \code{\link{!}}
-\item \code{\link{!=}}
-\item \code{\link{\%\%}}
-\item \code{\link{\%/\%}}
-\item \code{\link{\%in\%}}
-\item \code{\link{&}}
-\item \code{\link{*}}
-\item \code{\link{+}}
-\item \code{\link{-}}
-\item \code{\link{/}}
-\item \code{\link{<}}
-\item \code{\link{<=}}
-\item \code{\link{==}}
-\item \code{\link{>}}
-\item \code{\link{>=}}
+\item \code{\link[base:!]{!}}
+\item \code{\link[base:!=]{!=}}
+\item \code{\link[base:\%\%]{\%\%}}
+\item \code{\link[base:\%/\%]{\%/\%}}
+\item \code{\link[base:\%in\%]{\%in\%}}
+\item \code{\link[base:&]{&}}
+\item \code{\link[base:*]{*}}
+\item \code{\link[base:+]{+}}
+\item \code{\link[base:-]{-}}
+\item \code{\link[base:/]{/}}
+\item \code{\link[base:<]{<}}
+\item \code{\link[base:<=]{<=}}
+\item \code{\link[base:==]{==}}
+\item \code{\link[base:>]{>}}
+\item \code{\link[base:>=]{>=}}
 \item \code{\link[base:ISOdate]{ISOdate()}}
 \item \code{\link[base:ISOdatetime]{ISOdatetime()}}
-\item \code{\link{^}}
+\item \code{\link[base:^]{^}}
 \item \code{\link[base:abs]{abs()}}
 \item \code{\link[base:acos]{acos()}}
 \item \code{\link[base:acosh]{acosh()}}
@@ -184,7 +184,7 @@ Valid values are "s", "ms" (default), "us", "ns".
 \item \code{\link[base:tolower]{tolower()}}
 \item \code{\link[base:toupper]{toupper()}}
 \item \code{\link[base:trunc]{trunc()}}
-\item \code{\link{|}}
+\item \code{\link[base:|]{|}}
 }
 }
 

r/man/arrow_info.Rd

@@ -2,7 +2,6 @@
 % Please edit documentation in R/arrow-info.R
 \name{arrow_info}
 \alias{arrow_info}
-\alias{arrow_available}
 \alias{arrow_with_acero}
 \alias{arrow_with_dataset}
 \alias{arrow_with_substrait}
@@ -15,8 +14,6 @@
 \usage{
 arrow_info()
 
-arrow_available()
-
 arrow_with_acero()
 
 arrow_with_dataset()

r/man/infer_type.Rd

@@ -2,12 +2,9 @@
 % Please edit documentation in R/type.R
 \name{infer_type}
 \alias{infer_type}
-\alias{type}
 \title{Infer the arrow Array type from an R object}
 \usage{
 infer_type(x, ...)
-
-type(x)
 }
 \arguments{
 \item{x}{an R object (usually a vector) to be converted to an \link{Array} or
@@ -19,7 +16,7 @@ type(x)
 An arrow \link[=data-type]{data type}
 }
 \description{
-\code{\link[=type]{type()}} is deprecated in favor of \code{\link[=infer_type]{infer_type()}}.
+Infer the arrow Array type from an R object
 }
 \examples{
 infer_type(1:10)

r/src/type_infer.cpp

@@ -222,7 +222,7 @@ std::shared_ptr<arrow::DataType> InferArrowType(SEXP x) {
     cpp11::sexp type_result = cpp11::package("arrow")["infer_type"](
         x, cpp11::named_arg("from_array_infer_type") = true);
     if (!Rf_inherits(type_result, "DataType")) {
-      cpp11::stop("type() did not return an object of type DataType");
+      cpp11::stop("infer_type() did not return an object of type DataType");
     }
 
     return cpp11::as_cpp<std::shared_ptr<arrow::DataType>>(type_result);

r/tests/testthat/test-arrow-info.R

@@ -21,7 +21,3 @@ test_that("arrow_info()", {
   options(arrow.foo = FALSE)
   expect_output(print(arrow_info()), "arrow.foo")
 })
-
-test_that("arrow_available() is deprecated", {
-  expect_deprecated(arrow_available(), "always")
-})

r/tests/testthat/test-type.R

@@ -327,15 +327,6 @@ test_that("infer_type() infers type for vctrs", {
   )
 })
 
-test_that("type() is deprecated", {
-  a <- Array$create(1:10)
-  expect_deprecated(
-    a_type <- type(a),
-    "infer_type"
-  )
-  expect_equal(a_type, a$type)
-})
-
 test_that("infer_type() infers type for lists of raw() as binary()", {
   expect_equal(
     infer_type(list(raw())),