From d1a6ead81c4bdd48bd89fb413d2ebb2eb0bc5afa Mon Sep 17 00:00:00 2001
From: jguer <me@jguer.space>
Date: Tue, 16 Mar 2021 23:07:43 +0100
Subject: [PATCH] style(deps): reduce scope where possible

---
 pkg/dep/depCheck.go     |  6 ++----
 pkg/dep/depOrder.go     | 19 +++++++------------
 pkg/dep/depPool.go      |  3 +--
 pkg/download/unified.go |  3 +--
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/pkg/dep/depCheck.go b/pkg/dep/depCheck.go
index 257717e6..923725cf 100644
--- a/pkg/dep/depCheck.go
+++ b/pkg/dep/depCheck.go
@@ -215,8 +215,7 @@ func (dp *Pool) _checkMissing(dep string, stack []string, missing *missing, noDe
 		return
 	}
 
-	aurPkg := dp.findSatisfierAur(dep)
-	if aurPkg != nil {
+	if aurPkg := dp.findSatisfierAur(dep); aurPkg != nil {
 		missing.Good.Set(dep)
 		combinedDepList := ComputeCombinedDepList(aurPkg, noDeps, noCheckDeps)
 		for _, deps := range combinedDepList {
@@ -233,8 +232,7 @@ func (dp *Pool) _checkMissing(dep string, stack []string, missing *missing, noDe
 		return
 	}
 
-	repoPkg := dp.findSatisfierRepo(dep)
-	if repoPkg != nil {
+	if repoPkg := dp.findSatisfierRepo(dep); repoPkg != nil {
 		missing.Good.Set(dep)
 
 		if noDeps {
diff --git a/pkg/dep/depOrder.go b/pkg/dep/depOrder.go
index f4044606..da85c694 100644
--- a/pkg/dep/depOrder.go
+++ b/pkg/dep/depOrder.go
@@ -28,18 +28,16 @@ func GetOrder(dp *Pool, noDeps, noCheckDeps bool) *Order {
 
 	for _, target := range dp.Targets {
 		dep := target.DepString()
-		aurPkg := dp.Aur[dep]
-		if aurPkg != nil && pkgSatisfies(aurPkg.Name, aurPkg.Version, dep) {
+
+		if aurPkg := dp.Aur[dep]; aurPkg != nil && pkgSatisfies(aurPkg.Name, aurPkg.Version, dep) {
 			do.orderPkgAur(aurPkg, dp, true, noDeps, noCheckDeps)
 		}
 
-		aurPkg = dp.findSatisfierAur(dep)
-		if aurPkg != nil {
+		if aurPkg := dp.findSatisfierAur(dep); aurPkg != nil {
 			do.orderPkgAur(aurPkg, dp, true, noDeps, noCheckDeps)
 		}
 
-		repoPkg := dp.findSatisfierRepo(dep)
-		if repoPkg != nil {
+		if repoPkg := dp.findSatisfierRepo(dep); repoPkg != nil {
 			do.orderPkgRepo(repoPkg, dp, true)
 		}
 	}
@@ -55,13 +53,11 @@ func (do *Order) orderPkgAur(pkg *rpc.Pkg, dp *Pool, runtime, noDeps, noCheckDep
 
 	for i, deps := range ComputeCombinedDepList(pkg, noDeps, noCheckDeps) {
 		for _, dep := range deps {
-			aurPkg := dp.findSatisfierAur(dep)
-			if aurPkg != nil {
+			if aurPkg := dp.findSatisfierAur(dep); aurPkg != nil {
 				do.orderPkgAur(aurPkg, dp, runtime && i == 0, noDeps, noCheckDeps)
 			}
 
-			repoPkg := dp.findSatisfierRepo(dep)
-			if repoPkg != nil {
+			if repoPkg := dp.findSatisfierRepo(dep); repoPkg != nil {
 				do.orderPkgRepo(repoPkg, dp, runtime && i == 0)
 			}
 		}
@@ -84,8 +80,7 @@ func (do *Order) orderPkgRepo(pkg db.IPackage, dp *Pool, runtime bool) {
 	delete(dp.Repo, pkg.Name())
 
 	for _, dep := range dp.AlpmExecutor.PackageDepends(pkg) {
-		repoPkg := dp.findSatisfierRepo(dep.String())
-		if repoPkg != nil {
+		if repoPkg := dp.findSatisfierRepo(dep.String()); repoPkg != nil {
 			do.orderPkgRepo(repoPkg, dp, runtime)
 		}
 	}
diff --git a/pkg/dep/depPool.go b/pkg/dep/depPool.go
index 1369ed99..680faedc 100644
--- a/pkg/dep/depPool.go
+++ b/pkg/dep/depPool.go
@@ -356,8 +356,7 @@ func (dp *Pool) ResolveRepoDependency(pkg db.IPackage, noDeps bool) {
 		}
 
 		// has satisfier in repo: fetch it
-		repoPkg := dp.AlpmExecutor.SyncSatisfier(dep.String())
-		if repoPkg != nil {
+		if repoPkg := dp.AlpmExecutor.SyncSatisfier(dep.String()); repoPkg != nil {
 			dp.ResolveRepoDependency(repoPkg, noDeps)
 		}
 	}
diff --git a/pkg/download/unified.go b/pkg/download/unified.go
index 1e5c286a..35d69543 100644
--- a/pkg/download/unified.go
+++ b/pkg/download/unified.go
@@ -29,8 +29,7 @@ func GetPkgbuilds(dbExecutor db.Executor, httpClient *http.Client, targets []str
 		aur := true
 		dbName, name := text.SplitDBFromName(target)
 		if dbName != "aur" && (mode == settings.ModeAny || mode == settings.ModeRepo) {
-			pkg := dbExecutor.SyncPackage(name)
-			if pkg != nil {
+			if pkg := dbExecutor.SyncPackage(name); pkg != nil {
 				aur = false
 				name = getURLName(pkg)
 				dbName = pkg.DB().Name()