Merge branch 'master' of github.com:tidyverse/dplyr

NEWS.md

@@ -1,3 +1,7 @@
+# dplyr 0.7.0.9000
+
+* Fix undefined behaviour in `between()`, where `NA_REAL` were assigned instead of `NA_LOGICAL`. (#2855, @zeehio)
+
 # dplyr 0.7.0
 
 ## New data, functions, and features

src/between.cpp

@@ -27,13 +27,13 @@ LogicalVector between(NumericVector x, double left, double right) {
 
   if (NumericVector::is_na(left) || NumericVector::is_na(right)) {
     for (int i = 0; i < n; ++i)
-      out[i] = NA_REAL;
+      out[i] = NA_LOGICAL;
     return out;
   }
 
   for (int i = 0; i < n; ++i) {
     if (NumericVector::is_na(x[i])) {
-      out[i] = NA_REAL;
+      out[i] = NA_LOGICAL;
     } else if ((x[i] >= left) && (x[i] <= right)) {
       out[i] = true;
     } else {

vignettes/programming.Rmd

@@ -150,7 +150,6 @@ mutate_y <- function(df) {
 }
 
 mutate_y(df1)
-# Before dplyr is released, this will give a nice error message
 ```
 
 If this function is in a package, using `.data` also prevents `R CMD check` from giving a NOTE about undefined global variables (provided that you've also imported `rlang::.data` with `@importFrom rlang .data`).
@@ -412,25 +411,31 @@ In practice, the formula is the better of the two options because it captures th
 
 ```{r}
 f <- function(x) {
-  ~ x
+  quo(x)
 }
 
 x1 <- f(10)
 x2 <- f(100)
 ```
 
-It might look like the expressions are the same if you print them out. But look carefully at the environments --- they're different.
+It might look like the expressions are the same if you print them out.
 
 ```{r}
 x1
 x2
 ```
 
-When we evaluate those formulas using `rlang::eval_tidy()`, we see that they yield different values:
-
+But if you inspect the environments using `rlang::get_env()` --- they're different.
 ```{r, message = FALSE}
 library(rlang)
 
+get_env(x1)
+get_env(x2)
+```
+
+Further, when we evaluate those formulas using `rlang::eval_tidy()`, we see that they yield different values:
+
+```{r}
 eval_tidy(x1)
 eval_tidy(x2)
 ```