replace golang.org/x/exp/slices with slices

determined-ai · Aug 17, 2023 · a06ee52 · a06ee52
1 parent dac16da
commit a06ee52
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 19 deletions.
diff --git a/agent/internal/container/container.go b/agent/internal/container/container.go
@@ -3,12 +3,12 @@ package container
 import (
 	"context"
 	"fmt"
+	"slices"
 	"strings"
 	"sync"
 	"syscall"
 
 	"github.com/pkg/errors"
-	"golang.org/x/exp/slices"
 
 	"github.com/sirupsen/logrus"
 

diff --git a/agent/internal/containers/spec.go b/agent/internal/containers/spec.go
@@ -3,14 +3,14 @@ package containers
 import (
 	"fmt"
 	"path/filepath"
+	"slices"
 	"strconv"
 	"strings"
 
 	dcontainer "github.com/docker/docker/api/types/container"
 
 	"github.com/docker/docker/api/types"
 	"github.com/pkg/errors"
-	"golang.org/x/exp/slices"
 
 	"github.com/determined-ai/determined/agent/internal/container"
 	"github.com/determined-ai/determined/agent/internal/detect"

diff --git a/agent/pkg/cruntimes/crutils.go b/agent/pkg/cruntimes/crutils.go
@@ -12,11 +12,11 @@ import (
 	"path"
 	"path/filepath"
 	"regexp"
+	"slices"
 	"strings"
 
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/exp/slices"
 
 	"github.com/determined-ai/determined/agent/pkg/docker"
 	"github.com/determined-ai/determined/agent/pkg/events"

diff --git a/master/internal/api_experiment.go b/master/internal/api_experiment.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"math"
 	"net/http"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -15,8 +16,6 @@ import (
 
 	"github.com/determined-ai/determined/master/internal/job/jobservice"
 
-	"golang.org/x/exp/slices"
-
 	"github.com/labstack/echo/v4"
 	"github.com/uptrace/bun"
 

diff --git a/master/internal/api_tasks.go b/master/internal/api_tasks.go
@@ -3,12 +3,12 @@ package internal
 import (
 	"context"
 	"fmt"
+	"slices"
 	"strings"
 	"time"
 
 	structpb "github.com/golang/protobuf/ptypes/struct"
 	"github.com/pkg/errors"
-	"golang.org/x/exp/slices"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 

diff --git a/master/internal/api_trials.go b/master/internal/api_trials.go
@@ -4,13 +4,13 @@ import (
 	"context"
 	"fmt"
 	"math"
+	"slices"
 	"sort"
 	"strings"
 	"time"
 
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
-	"golang.org/x/exp/slices"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/encoding/protojson"

diff --git a/master/internal/command/command.go b/master/internal/command/command.go
@@ -3,11 +3,11 @@ package command
 import (
 	"context"
 	"fmt"
+	"slices"
 	"time"
 
 	"github.com/determined-ai/determined/master/internal/job/jobservice"
 
-	"golang.org/x/exp/slices"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/determined-ai/determined/master/pkg/cproto"

diff --git a/master/internal/db/postgres_tasks_intg_test.go b/master/internal/db/postgres_tasks_intg_test.go
@@ -10,12 +10,12 @@ import (
 	"go/parser"
 	"go/token"
 	"reflect"
+	"slices"
 	"strings"
 	"testing"
 	"time"
 
 	"github.com/shopspring/decimal"
-	"golang.org/x/exp/slices"
 
 	"github.com/stretchr/testify/require"
 

diff --git a/master/internal/experiment/bulk_action.go b/master/internal/experiment/bulk_action.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"slices"
 	"strconv"
 	"strings"
 
-	"golang.org/x/exp/slices"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 

diff --git a/master/internal/experiment_filter.go b/master/internal/experiment_filter.go
@@ -2,12 +2,11 @@ package internal
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 
 	"github.com/uptrace/bun"
 
-	"golang.org/x/exp/slices"
-
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 

diff --git a/master/internal/job/job.go b/master/internal/job/job.go
@@ -2,12 +2,11 @@ package job
 
 import (
 	"fmt"
+	"slices"
 	"sort"
 	"strings"
 	"sync"
 
-	"golang.org/x/exp/slices"
-
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 

diff --git a/master/internal/task/tasklogger/logger_test.go b/master/internal/task/tasklogger/logger_test.go
@@ -2,12 +2,12 @@ package tasklogger_test
 
 import (
 	"fmt"
+	"slices"
 	"sync"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
 
 	"github.com/determined-ai/determined/master/internal/task/tasklogger"
 	"github.com/determined-ai/determined/master/pkg/model"

diff --git a/master/internal/usergroup/postgres_groups.go b/master/internal/usergroup/postgres_groups.go
@@ -3,11 +3,11 @@ package usergroup
 import (
 	"context"
 	"database/sql"
+	"slices"
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/uptrace/bun"
-	"golang.org/x/exp/slices"
 
 	"github.com/determined-ai/determined/master/internal/db"
 	"github.com/determined-ai/determined/master/pkg/model"

diff --git a/master/pkg/cproto/container.go b/master/pkg/cproto/container.go
@@ -1,7 +1,7 @@
 package cproto
 
 import (
-	"golang.org/x/exp/slices"
+	"slices"
 
 	"github.com/determined-ai/determined/master/pkg/check"
 	"github.com/determined-ai/determined/master/pkg/device"

diff --git a/master/pkg/cproto/state.go b/master/pkg/cproto/state.go
@@ -2,10 +2,10 @@ package cproto
 
 import (
 	"fmt"
+	"slices"
 
 	"github.com/docker/docker/api/types"
 	"github.com/pkg/errors"
-	"golang.org/x/exp/slices"
 
 	"github.com/determined-ai/determined/master/pkg/check"
 	"github.com/determined-ai/determined/proto/pkg/containerv1"

diff --git a/master/pkg/model/task_container_defaults.go b/master/pkg/model/task_container_defaults.go
@@ -3,11 +3,11 @@ package model
 import (
 	"encoding/json"
 	"fmt"
+	"slices"
 	"strings"
 
 	"github.com/docker/docker/api/types"
 	"github.com/jinzhu/copier"
-	"golang.org/x/exp/slices"
 
 	k8sV1 "k8s.io/api/core/v1"