chore: rearrange code

Signed-off-by: Shiwei Zhang <[email protected]>

progress/manager.go

@@ -33,7 +33,12 @@ type Manager interface {
 // ManagerFunc is an adapter to allow the use of ordinary functions as Managers.
 // If f is a function with the appropriate signature, ManagerFunc(f) is a
 // [Manager] that calls f.
-type ManagerFunc func(ocispec.Descriptor, Status, error) error
+type ManagerFunc func(desc ocispec.Descriptor, status Status, err error) error
+
+// Close closes the manager.
+func (f ManagerFunc) Close() error {
+	return nil
+}
 
 // Track starts tracking the progress of a descriptor.
 func (f ManagerFunc) Track(desc ocispec.Descriptor) (Tracker, error) {
@@ -42,11 +47,6 @@ func (f ManagerFunc) Track(desc ocispec.Descriptor) (Tracker, error) {
 	}), nil
 }
 
-// Close closes the manager.
-func (f ManagerFunc) Close() error {
-	return nil
-}
-
 // Record adds the progress of a descriptor as a single entry.
 func Record(m Manager, desc ocispec.Descriptor, status Status) error {
 	tracker, err := m.Track(desc)

progress/tracker.go

@@ -32,7 +32,12 @@ type Tracker interface {
 // TrackerFunc is an adapter to allow the use of ordinary functions as Trackers.
 // If f is a function with the appropriate signature, TrackerFunc(f) is a
 // [Tracker] that calls f.
-type TrackerFunc func(Status, error) error
+type TrackerFunc func(status Status, err error) error
+
+// Close closes the tracker.
+func (f TrackerFunc) Close() error {
+	return nil
+}
 
 // Update updates the status of the descriptor.
 func (f TrackerFunc) Update(status Status) error {
@@ -44,11 +49,6 @@ func (f TrackerFunc) Fail(err error) error {
 	return f(Status{}, err)
 }
 
-// Close closes the tracker.
-func (f TrackerFunc) Close() error {
-	return nil
-}
-
 // Start starts tracking the transmission.
 func Start(t Tracker) error {
 	return t.Update(Status{