Simplify page tree logic

This is preparation for #6041.

For historic reasons, the code for bulding the section tree and the taxonomies were very much separate.

This works, but makes it hard to extend, maintain, and possibly not so fast as it could be.

This simplification also introduces 3 slightly breaking changes, which I suspect most people will be pleased about. See referenced issues:

This commit also switches the radix tree dependency to a mutable implementation: github.com/armon/go-radix.

Fixes #6154
Fixes #6153
Fixes #6152

1 files changed, 2 insertions, 7 deletions

diff --git a/hugolib/pages_capture.go b/hugolib/pages_capture.go
index 361b87e84..f332e85a8 100644
--- a/hugolib/pages_capture.go
+++ b/hugolib/pages_capture.go
@@ -36,9 +36,8 @@ import (
 
 	"github.com/gohugoio/hugo/source"
 
-	"github.com/gohugoio/hugo/hugofs"
-
 	"github.com/gohugoio/hugo/common/loggers"
+	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/afero"
 )
 
@@ -109,10 +108,6 @@ type contentDirKey struct {
 // Collect.
 func (c *pagesCollector) Collect() error {
 	c.proc.Start(context.Background())
-	if c.tracker != nil {
-		c.tracker.start()
-		defer c.tracker.stop()
-	}
 
 	var collectErr error
 	if len(c.filenames) == 0 {
@@ -125,7 +120,7 @@ func (c *pagesCollector) Collect() error {
 			dirs[contentDirKey{dir, filename, btype}] = true
 		}
 
-		for dir, _ := range dirs {
+		for dir := range dirs {
 			switch dir.tp {
 			case bundleLeaf, bundleBranch:
 				collectErr = c.collectDir(dir.dirname, true, nil)