You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by st...@apache.org on 2016/03/07 23:07:44 UTC

incubator-mynewt-newt git commit: change resolvedependency() to only have one return value to make type assertions cleaner

Repository: incubator-mynewt-newt
Updated Branches:
  refs/heads/rename_project_app bee670e08 -> 1b8ed1b63


change resolvedependency() to only have one return value to make type assertions cleaner


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/commit/1b8ed1b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/1b8ed1b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/1b8ed1b6

Branch: refs/heads/rename_project_app
Commit: 1b8ed1b63513a121505b225a721b2f67904ecb06
Parents: bee670e
Author: Sterling Hughes <st...@apache.org>
Authored: Mon Mar 7 14:07:29 2016 -0800
Committer: Sterling Hughes <st...@apache.org>
Committed: Mon Mar 7 14:07:29 2016 -0800

----------------------------------------------------------------------
 newt/builder/buildpackage.go | 17 +++++++----------
 newt/project/project.go      |  6 +++---
 newt/target/target.go        | 12 ++++++------
 3 files changed, 16 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/1b8ed1b6/newt/builder/buildpackage.go
----------------------------------------------------------------------
diff --git a/newt/builder/buildpackage.go b/newt/builder/buildpackage.go
index b085ec3..a303693 100644
--- a/newt/builder/buildpackage.go
+++ b/newt/builder/buildpackage.go
@@ -66,11 +66,10 @@ func (bpkg *BuildPackage) collectDepsAux(b *Builder,
 		}
 
 		// Get pkg structure
-		mydpkg, err := project.GetProject().ResolveDependency(dep)
-		if err != nil {
-			return err
+		dpkg := project.GetProject().ResolveDependency(dep).(*pkg.LocalPackage)
+		if dpkg == nil {
+			return util.NewNewtError("Cannot resolve dependency " + dep.String())
 		}
-		dpkg := mydpkg.(*pkg.LocalPackage)
 
 		dbpkg := b.Packages[dpkg]
 		if dbpkg == nil {
@@ -78,8 +77,7 @@ func (bpkg *BuildPackage) collectDepsAux(b *Builder,
 				dpkg.Name()))
 		}
 
-		err = dbpkg.collectDepsAux(b, set)
-		if err != nil {
+		if err := dbpkg.collectDepsAux(b, set); err != nil {
 			return err
 		}
 	}
@@ -206,11 +204,10 @@ func (bpkg *BuildPackage) loadDeps(b *Builder,
 			return false, err
 		}
 
-		mypkg, err := proj.ResolveDependency(newDep)
-		if err != nil {
-			return false, err
+		pkg := proj.ResolveDependency(newDep).(*pkg.LocalPackage)
+		if pkg == nil {
+			return false, util.NewNewtError("Cannot resolve dependency: " + newDep.String())
 		}
-		pkg := mypkg.(*pkg.LocalPackage)
 
 		if pkg == nil {
 			return false,

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/1b8ed1b6/newt/project/project.go
----------------------------------------------------------------------
diff --git a/newt/project/project.go b/newt/project/project.go
index bb4d4d0..83b1a5a 100644
--- a/newt/project/project.go
+++ b/newt/project/project.go
@@ -203,16 +203,16 @@ func (proj *Project) Init(dir string) error {
 	return nil
 }
 
-func (proj *Project) ResolveDependency(dep interfaces.DependencyInterface) (interfaces.PackageInterface, error) {
+func (proj *Project) ResolveDependency(dep interfaces.DependencyInterface) interfaces.PackageInterface {
 	for _, pkgList := range proj.packages {
 		for _, pkg := range *pkgList {
 			if dep.SatisfiesDependency(pkg) {
-				return pkg, nil
+				return pkg
 			}
 		}
 	}
 
-	return nil, util.NewNewtError("Can't resolve dependency: " + dep.String())
+	return nil
 }
 
 func findProjectDir(dir string) (string, error) {

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/1b8ed1b6/newt/target/target.go
----------------------------------------------------------------------
diff --git a/newt/target/target.go b/newt/target/target.go
index df074d1..a2113e3 100644
--- a/newt/target/target.go
+++ b/newt/target/target.go
@@ -98,21 +98,21 @@ func (target *Target) Package() *pkg.LocalPackage {
 
 func (target *Target) Compiler() *pkg.LocalPackage {
 	dep, _ := pkg.NewDependency(nil, target.CompilerName)
-	mypkg, _ := project.GetProject().ResolveDependency(dep)
+	mypkg := project.GetProject().ResolveDependency(dep).(*pkg.LocalPackage)
 
-	return mypkg.(*pkg.LocalPackage)
+	return mypkg
 }
 
 func (target *Target) App() *pkg.LocalPackage {
 	dep, _ := pkg.NewDependency(nil, target.AppName)
-	mypkg, _ := project.GetProject().ResolveDependency(dep)
-	return mypkg.(*pkg.LocalPackage)
+	mypkg := project.GetProject().ResolveDependency(dep).(*pkg.LocalPackage)
+	return mypkg
 }
 
 func (target *Target) Bsp() *pkg.LocalPackage {
 	dep, _ := pkg.NewDependency(nil, target.BspName)
-	mypkg, _ := project.GetProject().ResolveDependency(dep)
-	return mypkg.(*pkg.LocalPackage)
+	mypkg := project.GetProject().ResolveDependency(dep).(*pkg.LocalPackage)
+	return mypkg
 }
 
 // Save the target's configuration elements