reduce nesting where possible

r-lib · Nov 17, 2023 · d2998ed · d2998ed
1 parent 3e7bb47
commit d2998ed
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/R/cache.R b/R/cache.R
@@ -127,9 +127,8 @@ retrieve_lint <- function(cache, expr, linter, lines) {
     )
     if (is.na(new_line_number)) {
       return(NULL)
-    } else {
-      lints[[i]]$line_number <- new_line_number
     }
+    lints[[i]]$line_number <- new_line_number
   }
   cache_lint(cache, expr, linter, lints)
   lints

diff --git a/R/settings_utils.R b/R/settings_utils.R
@@ -108,7 +108,6 @@ find_local_config <- function(path, config_file) {
 pkg_name <- function(path = find_package()) {
   if (is.null(path)) {
     return(NULL)
-  } else {
-    read.dcf(file.path(path, "DESCRIPTION"), fields = "Package")[1L]
   }
+  read.dcf(file.path(path, "DESCRIPTION"), fields = "Package")[1L]
 }
diff --git a/inst/example/complexity.R b/inst/example/complexity.R
@@ -3,6 +3,7 @@ complexity <- function(x) {
     if (x > 10.0) {
       if (x > 20.0) {
         x <- x / 2.0
+        return(x)
       } else {
         return(x)
       }
@@ -13,12 +14,12 @@ complexity <- function(x) {
     if (x < -10.0) {
       if (x < -20.0) {
         x <- x * 2.0
+        return(x)
       } else {
         return(x)
       }
     } else {
       return(x)
     }
   }
-  x
 }