Go 1.9 fixes

Author: KyleBanks

.travis.yml

@@ -1,8 +1,7 @@
 language: go
 sudo: false
 go:
-  - 1.7.x
-  - 1.8.x
+  - 1.9.x
 before_install:
   - go get github.com/mattn/goveralls
 script:

cmd/depth/depth.go

@@ -84,10 +84,10 @@ func writePkgSummary(w io.Writer, pkg depth.Pkg) {
 		collectSummary(&sum, p, set)
 	}
 	fmt.Fprintf(w, "%d dependencies (%d internal, %d external, %d testing).\n",
-	                    sum.numInternal + sum.numExternal,
-											sum.numInternal,
-											sum.numExternal,
-										  sum.numTesting)
+		sum.numInternal+sum.numExternal,
+		sum.numInternal,
+		sum.numExternal,
+		sum.numTesting)
 }
 
 func collectSummary(sum *summary, pkg depth.Pkg, nameSet map[string]struct{}) {

cmd/depth/depth_test.go

@@ -53,10 +53,11 @@ func Example_handlePkgsStrings() {
 	// Output:
 	// strings
 	//   ├ errors
+	//   ├ internal/cpu
 	//   ├ io
 	//   ├ unicode
 	//   └ unicode/utf8
-	// 4 dependencies (4 internal, 0 external, 0 testing).
+	// 5 dependencies (5 internal, 0 external, 0 testing).
 
 }
 
@@ -70,6 +71,7 @@ func Example_handlePkgsTestStrings() {
 	//   ├ bytes
 	//   ├ errors
 	//   ├ fmt
+	//   ├ internal/cpu
 	//   ├ io
 	//   ├ io/ioutil
 	//   ├ math/rand
@@ -79,7 +81,7 @@ func Example_handlePkgsTestStrings() {
 	//   ├ unicode
 	//   ├ unicode/utf8
 	//   └ unsafe
-	// 12 dependencies (12 internal, 0 external, 8 testing).
+	// 13 dependencies (13 internal, 0 external, 8 testing).
 }
 
 func Example_handlePkgsDepth() {
@@ -128,6 +130,11 @@ func Example_handlePkgsJson() {
 	//       "deps": null
 	//     },
 	//     {
+	//       "name": "internal/cpu",
+	//       "resolved": true,
+	//       "deps": null
+	//     },
+	//     {
 	//       "name": "io",
 	//       "resolved": true,
 	//       "deps": null

depth.go

@@ -67,7 +67,7 @@ func (t *Tree) Resolve(name string) error {
 		Name:   name,
 		Tree:   t,
 		SrcDir: pwd,
-		Test: false,
+		Test:   false,
 	}
 
 	// Reset the import cache each time to ensure a reused Tree doesn't

pkg.go

@@ -60,7 +60,7 @@ func (p *Pkg) Resolve(i Importer) {
 		}
 	}
 
-  //first we set the regular dependencies, then we add the test dependencies
+	//first we set the regular dependencies, then we add the test dependencies
 	//sharing the same set. This allows us to mark all test-only deps linearly
 	unique := make(map[string]struct{})
 	p.setDeps(i, pkg.Imports, pkg.Dir, unique, false)
@@ -98,7 +98,7 @@ func (p *Pkg) addDep(i Importer, name string, srcDir string, isTest bool) {
 		SrcDir: srcDir,
 		Tree:   p.Tree,
 		Parent: p,
-		Test: isTest,
+		Test:   isTest,
 	}
 	dep.Resolve(i)