Move diff to core/diff

Signed-off-by: Derek McGowan <derek@mcg.dev>

client/container_checkpoint_opts.go

@@ -25,7 +25,7 @@ import (
 
 	tasks "github.com/containerd/containerd/v2/api/services/tasks/v1"
 	"github.com/containerd/containerd/v2/core/containers"
-	"github.com/containerd/containerd/v2/diff"
+	"github.com/containerd/containerd/v2/core/diff"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/platforms"
 	"github.com/containerd/containerd/v2/protobuf"

client/diff.go

@@ -18,8 +18,8 @@ package client
 
 import (
 	diffapi "github.com/containerd/containerd/v2/api/services/diff/v1"
-	"github.com/containerd/containerd/v2/diff"
-	"github.com/containerd/containerd/v2/diff/proxy"
+	"github.com/containerd/containerd/v2/core/diff"
+	"github.com/containerd/containerd/v2/core/diff/proxy"
 )
 
 // DiffService handles the computation and application of diffs

client/image.go

@@ -24,7 +24,7 @@ import (
 	"sync"
 
 	"github.com/containerd/containerd/v2/core/content"
-	"github.com/containerd/containerd/v2/diff"
+	"github.com/containerd/containerd/v2/core/diff"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/images/usage"

client/task.go

@@ -30,7 +30,7 @@ import (
 	"github.com/containerd/containerd/v2/api/types"
 	"github.com/containerd/containerd/v2/cio"
 	"github.com/containerd/containerd/v2/core/content"
-	"github.com/containerd/containerd/v2/diff"
+	"github.com/containerd/containerd/v2/core/diff"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/mount"