Merge remote-tracking branch 'refs/remotes/origin/main'

krlmlr · krlmlr · commit 466aa47e9671 · 2022-04-10T08:48:58.000+02:00
diff --git a/R/compat-lifecycle.R b/R/compat-lifecycle.R
@@ -100,7 +100,7 @@ signal_soft_deprecated <- function(msg, id = msg, env = rlang::caller_env(2)) {
   }
 
   if (rlang::is_true(rlang::peek_option("lifecycle_verbose_soft_deprecation")) ||
-      env_inherits_global(env)) {
+    env_inherits_global(env)) {
     warn_deprecated(msg, id)
     return(invisible(NULL))
   }
@@ -109,8 +109,8 @@ signal_soft_deprecated <- function(msg, id = msg, env = rlang::caller_env(2)) {
   # testthat clones the namespace
   tested_package <- Sys.getenv("TESTTHAT_PKG")
   if (nzchar(tested_package) &&
-        identical(Sys.getenv("NOT_CRAN"), "true") &&
-        rlang::env_name(topenv(env)) == rlang::env_name(rlang::ns_env(tested_package))) {
+    identical(Sys.getenv("NOT_CRAN"), "true") &&
+    rlang::env_name(topenv(env)) == rlang::env_name(rlang::ns_env(tested_package))) {
     warn_deprecated(msg, id)
     return(invisible(NULL))
   }
@@ -127,7 +127,7 @@ warn_deprecated <- function(msg, id = msg) {
   }
 
   if (!rlang::is_true(rlang::peek_option("lifecycle_repeat_warnings")) &&
-        rlang::env_has(.rlang_lifecycle_deprecation_env, id)) {
+    rlang::env_has(.rlang_lifecycle_deprecation_env, id)) {
     return(invisible(NULL))
   }
 

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ signal_soft_deprecated <- function(msg, id = msg, env = rlang::caller_env(2)) {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`if (rlang::is_true(rlang::peek_option("lifecycle_verbose_soft_deprecation")) \|\|`
`103`		`- env_inherits_global(env)) {`
	`103`	`+ env_inherits_global(env)) {`
`104`	`104`	`warn_deprecated(msg, id)`
`105`	`105`	`return(invisible(NULL))`
`106`	`106`	`}`
`@@ -109,8 +109,8 @@ signal_soft_deprecated <- function(msg, id = msg, env = rlang::caller_env(2)) {`
`109`	`109`	`# testthat clones the namespace`
`110`	`110`	`tested_package <- Sys.getenv("TESTTHAT_PKG")`
`111`	`111`	`if (nzchar(tested_package) &&`
`112`		`- identical(Sys.getenv("NOT_CRAN"), "true") &&`
`113`		`- rlang::env_name(topenv(env)) == rlang::env_name(rlang::ns_env(tested_package))) {`
	`112`	`+ identical(Sys.getenv("NOT_CRAN"), "true") &&`
	`113`	`+ rlang::env_name(topenv(env)) == rlang::env_name(rlang::ns_env(tested_package))) {`
`114`	`114`	`warn_deprecated(msg, id)`
`115`	`115`	`return(invisible(NULL))`
`116`	`116`	`}`
`@@ -127,7 +127,7 @@ warn_deprecated <- function(msg, id = msg) {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`if (!rlang::is_true(rlang::peek_option("lifecycle_repeat_warnings")) &&`
`130`		`- rlang::env_has(.rlang_lifecycle_deprecation_env, id)) {`
	`130`	`+ rlang::env_has(.rlang_lifecycle_deprecation_env, id)) {`
`131`	`131`	`return(invisible(NULL))`
`132`	`132`	`}`
`133`	`133`