Merge pull request #754 from gopcua/fs/use-maps-slices

use maps and slices from the stdlib
gopcua · Dec 5, 2024 · 476afe8 · 476afe8
2 parents 7c3c4fb + a1ed317
commit 476afe8
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 14 deletions.
diff --git a/client_sub.go b/client_sub.go
@@ -4,14 +4,14 @@ import (
 	"context"
 	"io"
 	"log"
+	"slices"
 	"time"
 
 	"github.com/gopcua/opcua/debug"
 	"github.com/gopcua/opcua/errors"
 	"github.com/gopcua/opcua/stats"
 	"github.com/gopcua/opcua/ua"
 	"github.com/gopcua/opcua/uasc"
-	"golang.org/x/exp/slices"
 )
 
 // Subscribe creates a Subscription with given parameters.

diff --git a/debug/debug.go b/debug/debug.go
@@ -12,9 +12,8 @@ import (
 	"log"
 	"os"
 	"runtime"
+	"slices"
 	"strings"
-
-	"golang.org/x/exp/slices"
 )
 
 // Flags contains the debug flags set by OPC_DEBUG.

diff --git a/go.mod b/go.mod
@@ -5,7 +5,6 @@ go 1.22.0
 require (
 	github.com/google/uuid v1.3.0
 	github.com/pascaldekloe/goe v0.1.1
-	golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d
 	golang.org/x/term v0.8.0
 )
 

diff --git a/go.sum b/go.sum
@@ -2,8 +2,6 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/pascaldekloe/goe v0.1.1 h1:Ah6WQ56rZONR3RW3qWa2NCZ6JAVvSpUcoLBaOmYFt9Q=
 github.com/pascaldekloe/goe v0.1.1/go.mod h1:KSyfaxQOh0HZPjDP1FL/kFtbqYqrALJTaMafFUIccqU=
-golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d h1:0olWaB5pg3+oychR51GUVCEsGkeCU/2JxjBgIo4f3M0=
-golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
 golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=

diff --git a/server/monitored_item_service.go b/server/monitored_item_service.go
@@ -2,13 +2,13 @@ package server
 
 import (
 	"errors"
+	"slices"
 	"sync"
 	"sync/atomic"
 	"time"
 
 	"github.com/gopcua/opcua/ua"
 	"github.com/gopcua/opcua/uasc"
-	"golang.org/x/exp/slices"
 )
 
 // MonitoredItemService implements the MonitoredItem Service Set.

diff --git a/server/node.go b/server/node.go
@@ -2,11 +2,10 @@ package server
 
 import (
 	"log"
+	"maps"
+	"slices"
 	"time"
 
-	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
-
 	"github.com/gopcua/opcua/id"
 	"github.com/gopcua/opcua/server/attrs"
 	"github.com/gopcua/opcua/server/refs"

diff --git a/server/server.go b/server/server.go
@@ -11,12 +11,11 @@ import (
 	"fmt"
 	"log"
 	"net"
+	"slices"
 	"strings"
 	"sync"
 	"time"
 
-	"golang.org/x/exp/slices"
-
 	"github.com/gopcua/opcua/id"
 	"github.com/gopcua/opcua/schema"
 	"github.com/gopcua/opcua/ua"

diff --git a/server/view_service.go b/server/view_service.go
@@ -1,10 +1,9 @@
 package server
 
 import (
+	"slices"
 	"time"
 
-	"golang.org/x/exp/slices"
-
 	"github.com/gopcua/opcua/id"
 	"github.com/gopcua/opcua/ua"
 	"github.com/gopcua/opcua/uasc"