Cleanup name references

Author: pcj

language/scala/cleanup.go

@@ -15,31 +15,33 @@ import (
 
 const (
 	// SCALA_GAZELLE_UNMANAGED_DEPS_FILE is an environment variable that, if
-	// defined, activates the saving of uncorrelated deps for a given set of
+	// defined, activates the saving of unmanaged deps for a given set of
 	// rules that have recorded it.
 	SCALA_GAZELLE_UNMANAGED_DEPS_FILE = procutil.EnvVar("SCALA_GAZELLE_UNMANAGED_DEPS_FILE")
 )
 
 // cleanup is the top-level function for various cleanup related features.
 func (sl *scalaLang) cleanup() {
 	if err := sl.cleanupUnmanagedDeps(); err != nil {
-		log.Println("warning: cleanup uncorrelated deps failed: %v", err)
+		log.Println("warning: cleanup unmanaged deps failed: %v", err)
 	}
 }
 
 func (sl *scalaLang) cleanupUnmanagedDeps() error {
 	if filename, ok := procutil.LookupEnv(SCALA_GAZELLE_UNMANAGED_DEPS_FILE); ok {
-		return sl.saveUncorrelatedDepsFile(filename)
+		return sl.saveUnmanagedDepsFile(filename)
 	} else {
+		log.Println("SCALA_GAZELLE_UNMANAGED_DEPS_FILE not set")
 		sl.logger.Debug().Msg("SCALA_GAZELLE_UNMANAGED_DEPS_FILE not set")
 	}
 	return nil
 }
 
-func (sl *scalaLang) saveUncorrelatedDepsFile(filename string) error {
-	deps := sl.makeUncorrelatedDeps()
+func (sl *scalaLang) saveUnmanagedDepsFile(filename string) error {
+	deps := sl.makeUnmanagedDeps()
 	if len(deps) == 0 {
-		sl.logger.Debug().Msg("SCALA_GAZELLE_UNMANAGED_DEPS_FILE not written (no uncorrelated deps to write)")
+		log.Println("SCALA_GAZELLE_UNMANAGED_DEPS_FILE not written (no unmanaged deps to write)")
+		sl.logger.Debug().Msg("SCALA_GAZELLE_UNMANAGED_DEPS_FILE not written (no unmanaged deps to write)")
 		return nil
 	}
 
@@ -53,22 +55,23 @@ func (sl *scalaLang) saveUncorrelatedDepsFile(filename string) error {
 		return err
 	}
 
-	sl.logger.Debug().Msg("Wrote uncorrelated deps to " + filename)
+	log.Println("Wrote unmanaged deps to " + filename)
+	sl.logger.Debug().Msgf("Wrote unmanaged deps to %s", filename)
 
 	return nil
 }
 
-func (sl *scalaLang) makeUncorrelatedDeps() []UncorrelatedDeps {
-	nonDirect := make(map[label.Label]UncorrelatedDeps)
+func (sl *scalaLang) makeUnmanagedDeps() []UnmanagedDeps {
+	nonDirect := make(map[label.Label]UnmanagedDeps)
 
 	for from, rule := range sl.knownRules {
 		if deps, ok := rule.PrivateAttr(scalaconfig.UnmanagedDepsPrivateAttrName).([]string); ok {
-			nonDirect[from] = UncorrelatedDeps{from: from, deps: deps}
-			sl.logger.Debug().Str("from", from.String()).Msgf("uncorrelated deps: %v", deps)
+			nonDirect[from] = UnmanagedDeps{from: from, deps: deps}
+			sl.logger.Debug().Str("from", from.String()).Msgf("unmanaged deps: %v", deps)
 		}
 	}
 
-	deps := make([]UncorrelatedDeps, 0, len(nonDirect))
+	deps := make([]UnmanagedDeps, 0, len(nonDirect))
 	for _, d := range nonDirect {
 		deps = append(deps, d)
 	}
@@ -82,11 +85,11 @@ func (sl *scalaLang) makeUncorrelatedDeps() []UncorrelatedDeps {
 	return deps
 }
 
-type UncorrelatedDeps struct {
+type UnmanagedDeps struct {
 	from label.Label
 	deps []string
 }
 
-func (td *UncorrelatedDeps) String() string {
+func (td *UnmanagedDeps) String() string {
 	return fmt.Sprintf("%v %v", td.from.String(), strings.Join(td.deps, " "))
 }

pkg/scalaconfig/config.go

@@ -141,8 +141,8 @@ const (
 	// target, has the same effect as the directive 'scala_keep_unmanaged_deps
 	// false'
 	NoUnknownDepsTagName = "no-unknown-deps"
-	// UnmanagedDepsPrivateAttrName is a private attr key where uncorrelated
-	// deps are stored.
+	// UnmanagedDepsPrivateAttrName is a private attr key where unmanaged deps
+	// are stored.
 	UnmanagedDepsPrivateAttrName = "_unmanaged_deps"
 )