Skip to content

Commit 916b8d7

Browse files
committed
minor updates rc3
1 parent 56941e5 commit 916b8d7

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#### New Features
44

5-
* Aio values `$result`, `$data` and `$raw` now resolve automatically without requiring `call_aio()`. Access the values directly and an 'unresolved' logical NA will be returned if the Aio operation is yet to complete.
5+
* Aio values `$result`, `$data` and `$raw` now resolve automatically without requiring `call_aio()`. Access directly and an 'unresolved' logical NA value will be returned if the Aio operation is yet to complete.
66
* `unresolved()` added as an auxiliary function to query whether an Aio is unresolved, for use in control flow statements.
77
* Integer error values generated by receive functions are now classed 'errorValue'. `is_error_value()` helper function included.
88
* `is_nul_byte()` added as a helper function for request/reply setups.

R/aio.R

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ stop_aio <- function(aio) {
123123
#'
124124
unresolved <- function(aio) {
125125

126-
{inherits(aio, "unresolvedExpr") && inherits(.subset2(aio, "data"), "unresolvedExpr") ||
127-
inherits(aio, "unresolvedValue") ||
126+
{inherits(aio, "unresolvedValue") ||
128127
inherits(aio, "recvAio") && inherits(.subset2(aio, "data"), "unresolvedValue") ||
129128
inherits(aio, "sendAio") && inherits(.subset2(aio, "result"), "unresolvedValue")} &&
130129
return(TRUE)

R/utils.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ is_error_value <- function(x) inherits(x, "errorValue")
101101
#'
102102
#' @param level specify a logging level
103103
#' \itemize{
104-
#' \item{'prev'} {which continues with the previous logging level}
104+
#' \item{'keep'} {which keeps the current logging level}
105105
#' \item{'check'} {which checks the value of environment variable 'NANONEXT_LOG'}
106106
#' \item{'error'} {which sends all NNG errors to stderr}
107107
#' \item{'info'} {which in addition sends key informational events such as
108-
#' socket open etc. to stdout.}
108+
#' socket open etc. to stdout}
109109
#' }
110110
#'
111111
#' @return Invisible NULL. A confirmation is printed to the console (stdout) if
@@ -131,7 +131,7 @@ logging <- function(level) {
131131
info = 1L,
132132
0L)
133133

134-
logging <- function(level = c("prev", "check", "error", "info")) {
134+
logging <- function(level = c("keep", "check", "error", "info")) {
135135

136136
missing(level) && return(cache)
137137
level <- match.arg(level)
@@ -142,7 +142,7 @@ logging <- function(level) {
142142
0L),
143143
error = 0L,
144144
info = 1L,
145-
prev = original)
145+
keep = original)
146146
if (cache != original) cat(sprintf("%s [ %s ] %s: %s\n",
147147
format.POSIXct(Sys.time()), "log level", "set to",
148148
if (cache) "info" else "error"), file = stdout())

man/logging.Rd

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)