From 457e135c0fdd0e562865856dd3e95fb65cb8ae04 Mon Sep 17 00:00:00 2001
From: Aleksandr Shreyner <al.shreyner@gmail.com>
Date: Wed, 9 Aug 2023 20:12:00 +0300
Subject: [PATCH] Update to work with released log/slog

---
 exp/go.mod                  | 3 +--
 exp/go.sum                  | 7 +++----
 exp/zapslog/doc.go          | 2 +-
 exp/zapslog/example_test.go | 2 +-
 exp/zapslog/slog.go         | 2 +-
 exp/zapslog/slog_test.go    | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/exp/go.mod b/exp/go.mod
index 3357b5eeb..7e0f32d2b 100644
--- a/exp/go.mod
+++ b/exp/go.mod
@@ -1,11 +1,10 @@
 module go.uber.org/zap/exp
 
-go 1.19
+go 1.21
 
 require (
 	github.com/stretchr/testify v1.8.1
 	go.uber.org/zap v1.24.0
-	golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b
 )
 
 require (
diff --git a/exp/go.sum b/exp/go.sum
index 9df6ac4b4..9f75eda69 100644
--- a/exp/go.sum
+++ b/exp/go.sum
@@ -1,8 +1,10 @@
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -15,14 +17,11 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
+go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
 go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
-golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 h1:5llv2sWeaMSnA3w2kS57ouQQ4pudlXrR0dCgw51QK9o=
-golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
-golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b h1:r+vk0EmXNmekl0S0BascoeeoHk/L7wmaW2QF90K+kYI=
-golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/exp/zapslog/doc.go b/exp/zapslog/doc.go
index f709f54d8..87f5ca79b 100644
--- a/exp/zapslog/doc.go
+++ b/exp/zapslog/doc.go
@@ -22,6 +22,6 @@
 // the supplied zapcore.Core.
 //
 // Since the slog proposal has not been officially accepted by the creation of this package,
-// we do not want Zap's standard packages to take a dependency on `golang.org/x/exp/slog`.
+// we do not want Zap's standard packages to take a dependency on `log/slog`.
 // Instead, we provide this separate module as a way for users to integrate Zap with slog.
 package zapslog // import "go.uber.org/zap/exp/zapslog"
diff --git a/exp/zapslog/example_test.go b/exp/zapslog/example_test.go
index e19adb853..24d16b139 100644
--- a/exp/zapslog/example_test.go
+++ b/exp/zapslog/example_test.go
@@ -22,12 +22,12 @@ package zapslog_test
 
 import (
 	"context"
+	"log/slog"
 	"net"
 	"time"
 
 	"go.uber.org/zap"
 	"go.uber.org/zap/exp/zapslog"
-	"golang.org/x/exp/slog"
 )
 
 type Password string
diff --git a/exp/zapslog/slog.go b/exp/zapslog/slog.go
index b999f17f6..27dbde5d8 100644
--- a/exp/zapslog/slog.go
+++ b/exp/zapslog/slog.go
@@ -22,11 +22,11 @@ package zapslog
 
 import (
 	"context"
+	"log/slog"
 	"runtime"
 
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-	"golang.org/x/exp/slog"
 )
 
 // Handler implements the slog.Handler by writing to a zap Core.
diff --git a/exp/zapslog/slog_test.go b/exp/zapslog/slog_test.go
index f49c52562..25fa2f3b5 100644
--- a/exp/zapslog/slog_test.go
+++ b/exp/zapslog/slog_test.go
@@ -21,12 +21,12 @@
 package zapslog
 
 import (
+	"log/slog"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
 	"go.uber.org/zap/zaptest/observer"
-	"golang.org/x/exp/slog"
 )
 
 func TestAddSource(t *testing.T) {