clean up unused utils

livekit · Sep 21, 2024 · e467087 · e467087
1 parent 0aee0ca
commit e467087
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 172 deletions.
diff --git a/livekit/types_test b/livekit/types_test
diff --git a/logger/logger.go b/logger/logger.go
@@ -379,7 +379,7 @@ func (l *zapLogger[T]) WithoutSampler() Logger {
 func (l *zapLogger[T]) WithDeferredValues() (Logger, DeferredFieldResolver) {
 	dup := *l
 	def, resolve := zaputil.NewDeferrer()
-	dup.deferred = append(dup.deferred[0:len(dup.deferred):len(dup.deferred)], def)
+	dup.deferred = append(dup.deferred, def)
 	dup.zap = dup.ToZap()
 	return &dup, resolve
 }

diff --git a/logger/slog.go b/logger/slog.go
@@ -27,11 +27,11 @@ func ToSlogHandler(log Logger) slog.Handler {
 
 type slogDiscard struct{}
 
-func (_ slogDiscard) Enabled(ctx context.Context, level slog.Level) bool {
+func (slogDiscard) Enabled(ctx context.Context, level slog.Level) bool {
 	return false
 }
 
-func (_ slogDiscard) Handle(ctx context.Context, record slog.Record) error {
+func (slogDiscard) Handle(ctx context.Context, record slog.Record) error {
 	return nil
 }
 

diff --git a/utils/messaging.go b/utils/messaging.go
diff --git a/utils/must.go b/utils/must.go
diff --git a/utils/options/options.go b/utils/options/options.go
@@ -20,3 +20,13 @@ func Apply[T any, F ~func(T)](o T, opts []F) T {
 	}
 	return o
 }
+
+func Make[T any, F ~func(*T)](opts []F) T {
+	var o T
+	Apply(&o, opts)
+	return o
+}
+
+func New[T any, F ~func(*T)](opts []F) *T {
+	return Apply(new(T), opts)
+}
diff --git a/utils/protoproxy.go b/utils/protoproxy.go
@@ -86,7 +86,7 @@ func (p *ProtoProxy[T]) Updated() <-chan struct{} {
 func (p *ProtoProxy[T]) Get() T {
 	p.lock.RLock()
 	defer p.lock.RUnlock()
-	return proto.Clone(p.message).(T)
+	return CloneProto(p.message)
 }
 
 func (p *ProtoProxy[T]) Stop() {