From d3ef21f870a14af40ad6f8744355213b8ad2a047 Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Fri, 5 Jun 2026 16:54:47 +0200 Subject: [PATCH] archiver: unexport BackupTarget type --- internal/archiver/archiver.go | 8 ++++---- internal/archiver/tree.go | 6 +++--- internal/archiver/tree_test.go | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/archiver/archiver.go b/internal/archiver/archiver.go index 676dbe4e2..4693b6b03 100644 --- a/internal/archiver/archiver.go +++ b/internal/archiver/archiver.go @@ -781,9 +781,9 @@ func (arch *Archiver) dirPathToNode(snPath, target string) (node *data.Node, err // // Paths returned with Explicit true are those the user listed literally; paths // inserted from directory expansion have Explicit false. -func resolveRelativeTargets(filesys fs.FS, targets []string) ([]BackupTarget, error) { +func resolveRelativeTargets(filesys fs.FS, targets []string) ([]backupTarget, error) { debug.Log("targets before resolving: %v", targets) - result := make([]BackupTarget, 0, len(targets)) + result := make([]backupTarget, 0, len(targets)) for _, target := range targets { if target != "" && filesys.VolumeName(target) == target { // special case to allow users to also specify a volume name "C:" instead of a path "C:\" @@ -793,7 +793,7 @@ func resolveRelativeTargets(filesys fs.FS, targets []string) ([]BackupTarget, er } pc, _ := pathComponents(filesys, target, false) if len(pc) > 0 { - result = append(result, BackupTarget{Path: target, Explicit: true}) + result = append(result, backupTarget{Path: target, Explicit: true}) continue } @@ -805,7 +805,7 @@ func resolveRelativeTargets(filesys fs.FS, targets []string) ([]BackupTarget, er sort.Strings(entries) for _, name := range entries { - result = append(result, BackupTarget{ + result = append(result, backupTarget{ Path: filesys.Join(target, name), Explicit: false, }) diff --git a/internal/archiver/tree.go b/internal/archiver/tree.go index c7700665a..9e760752b 100644 --- a/internal/archiver/tree.go +++ b/internal/archiver/tree.go @@ -274,16 +274,16 @@ func unrollTree(f fs.FS, t *tree) error { return nil } -// BackupTarget is a resolved backup path and whether the user passed this path +// backupTarget is a resolved backup path and whether the user passed this path // literally. Paths inserted when expanding a target with no path components // (for example ".") have Explicit false so include/exclude rules still apply. -type BackupTarget struct { +type backupTarget struct { Path string Explicit bool } // newTree creates a Tree from the target files/directories. -func newTree(fs fs.FS, targets []BackupTarget) (*tree, error) { +func newTree(fs fs.FS, targets []backupTarget) (*tree, error) { debug.Log("targets: %v", targets) tree := &tree{} seen := make(map[string]struct{}) diff --git a/internal/archiver/tree_test.go b/internal/archiver/tree_test.go index 189e8f047..f2c948f37 100644 --- a/internal/archiver/tree_test.go +++ b/internal/archiver/tree_test.go @@ -14,10 +14,10 @@ import ( // debug.Log requires Tree.String. var _ fmt.Stringer = tree{} -func testBackupTargets(paths []string) []BackupTarget { - tgts := make([]BackupTarget, len(paths)) +func testBackupTargets(paths []string) []backupTarget { + tgts := make([]backupTarget, len(paths)) for i, p := range paths { - tgts[i] = BackupTarget{Path: p, Explicit: true} + tgts[i] = backupTarget{Path: p, Explicit: true} } return tgts }