Merge commit '0dd7eea956c1e7f8dc85737b686dedd3cd96b48c'

Conflicts:
	DESCRIPTION

Author: hadley

.gitattributes

@@ -1,7 +1,7 @@
 Type: Package
 Package: dplyr
 Title: A Grammar of Data Manipulation
-Version: 1.0.9.9000
+Version: 1.0.99.9000
 Authors@R: 
     c(person(given = "Hadley",
              family = "Wickham",
@@ -36,19 +36,19 @@ Imports:
     magrittr (>= 1.5),
     methods,
     R6,
-    rlang (>= 1.0.2),
+    rlang (>= 1.0.4),
     tibble (>= 2.1.3),
-    tidyselect (>= 1.1.1),
+    tidyselect (>= 1.1.2.9000),
     utils,
-    vctrs (>= 0.4.1), 
+    vctrs (>= 0.4.1.9000), 
     pillar (>= 1.8.0)
 Suggests: 
     bench,
     broom,
     callr,
     covr,
     DBI,
-    dbplyr (>= 1.4.3),
+    dbplyr (>= 2.2.1),
     ggplot2,
     knitr,
     Lahman,
@@ -60,15 +60,19 @@ Suggests:
     RMySQL,
     RPostgreSQL,
     RSQLite,
+    stringi (>= 1.7.6),
     testthat (>= 3.1.1),
     tidyr, 
     withr
+Remotes:
+    r-lib/tidyselect,
+    r-lib/vctrs
 VignetteBuilder: 
     knitr
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.1.2
+RoxygenNote: 7.2.1
 Config/testthat/edition: 3
 Config/Needs/website:
     tidyverse,

DESCRIPTION

@@ -18,6 +18,10 @@ S3method(arrange_,tbl_df)
 S3method(as.data.frame,grouped_df)
 S3method(as.tbl,data.frame)
 S3method(as.tbl,tbl)
+S3method(as_join_by,character)
+S3method(as_join_by,default)
+S3method(as_join_by,dplyr_join_by)
+S3method(as_join_by,list)
 S3method(as_tibble,grouped_df)
 S3method(as_tibble,rowwise_df)
 S3method(auto_copy,data.frame)
@@ -32,8 +36,6 @@ S3method(compute,data.frame)
 S3method(copy_to,DBIConnection)
 S3method(copy_to,src_local)
 S3method(count,data.frame)
-S3method(default_missing,data.frame)
-S3method(default_missing,default)
 S3method(distinct,data.frame)
 S3method(distinct_,data.frame)
 S3method(distinct_,grouped_df)
@@ -109,6 +111,7 @@ S3method(nest_by,grouped_df)
 S3method(nest_join,data.frame)
 S3method(print,all_vars)
 S3method(print,any_vars)
+S3method(print,dplyr_join_by)
 S3method(print,dplyr_sel_vars)
 S3method(print,fun_list)
 S3method(print,location)
@@ -235,7 +238,6 @@ export(cur_group_id)
 export(cur_group_rows)
 export(current_vars)
 export(data_frame)
-export(data_frame_)
 export(db_analyze)
 export(db_begin)
 export(db_commit)
@@ -266,6 +268,7 @@ export(distinct_prepare)
 export(do)
 export(do_)
 export(dplyr_col_modify)
+export(dplyr_locale)
 export(dplyr_reconstruct)
 export(dplyr_row_slice)
 export(ends_with)
@@ -287,7 +290,6 @@ export(filter_all)
 export(filter_at)
 export(filter_if)
 export(first)
-export(frame_data)
 export(full_join)
 export(funs)
 export(funs_)
@@ -326,14 +328,14 @@ export(is.grouped_df)
 export(is.src)
 export(is.tbl)
 export(is_grouped_df)
+export(join_by)
 export(lag)
 export(last)
 export(last_col)
 export(lead)
 export(left_join)
 export(location)
 export(lst)
-export(lst_)
 export(make_tbl)
 export(matches)
 export(min_rank)
@@ -445,7 +447,6 @@ export(tbl)
 export(tbl_df)
 export(tbl_nongroup_vars)
 export(tbl_ptype)
-export(tbl_sum)
 export(tbl_vars)
 export(tibble)
 export(top_frac)
@@ -479,25 +480,20 @@ importFrom(glue,glue_data)
 importFrom(lifecycle,deprecated)
 importFrom(magrittr,"%>%")
 importFrom(methods,is)
-importFrom(pillar,format_glimpse)
 importFrom(pillar,glimpse)
-importFrom(stats,lag)
+importFrom(pillar,tbl_sum)
+importFrom(pillar,type_sum)
 importFrom(stats,setNames)
 importFrom(stats,update)
 importFrom(tibble,add_row)
 importFrom(tibble,as_data_frame)
 importFrom(tibble,as_tibble)
 importFrom(tibble,data_frame)
-importFrom(tibble,data_frame_)
-importFrom(tibble,frame_data)
 importFrom(tibble,is_tibble)
 importFrom(tibble,lst)
-importFrom(tibble,lst_)
 importFrom(tibble,new_tibble)
-importFrom(tibble,tbl_sum)
 importFrom(tibble,tibble)
 importFrom(tibble,tribble)
-importFrom(tibble,type_sum)
 importFrom(tibble,view)
 importFrom(tidyselect,all_of)
 importFrom(tidyselect,any_of)