* Fixed duplicating WithPanicCallback proxying to table config options

* Fixed comments for `xerrros.Is` and `xerrros.As`

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,6 @@
+* Fixed duplicating `WithPanicCallback` proxying to table config options
+* Fixed comments for `xerrros.Is` and `xerrros.As` 
+
 ## v3.18.4
 * Renamed internal packages `errors`, `net` and `resolver` to `xerrors`, `xnet` and `xresolver` for excluding ambiguous interpretation
 * Renamed internal error wrapper `xerrors.New` to `xerrors.Wrap`

internal/xerrors/xerrors.go

@@ -54,7 +54,7 @@ func HideEOF(err error) error {
 	return err
 }
 
-// As is a proxy to xerrors.As
+// As is a proxy to errors.As
 // This need to single import errors
 func As(err error, targets ...interface{}) bool {
 	if err == nil {
@@ -68,7 +68,7 @@ func As(err error, targets ...interface{}) bool {
 	return false
 }
 
-// Is is a improved proxy to xerrors.Is
+// Is is a improved proxy to errors.Is
 // This need to single import errors
 func Is(err error, targets ...error) bool {
 	if len(targets) == 0 {

options.go

@@ -359,11 +359,11 @@ func WithSessionPoolDeleteTimeout(deleteTimeout time.Duration) Option {
 func WithPanicCallback(panicCallback func(e interface{})) Option {
 	return func(ctx context.Context, c *connection) error {
 		c.panicCallback = panicCallback
-		c.tableOptions = append(c.tableOptions, tableConfig.WithPanicCallback(panicCallback))
+		c.discoveryOptions = append(c.discoveryOptions, discoveryConfig.WithPanicCallback(panicCallback))
 		c.coordinationOptions = append(c.coordinationOptions, coordinationConfig.WithPanicCallback(panicCallback))
-		c.schemeOptions = append(c.schemeOptions, schemeConfig.WithPanicCallback(panicCallback))
 		c.ratelimiterOptions = append(c.ratelimiterOptions, ratelimiterConfig.WithPanicCallback(panicCallback))
-		c.discoveryOptions = append(c.discoveryOptions, discoveryConfig.WithPanicCallback(panicCallback))
+		c.schemeOptions = append(c.schemeOptions, schemeConfig.WithPanicCallback(panicCallback))
+		c.scriptingOptions = append(c.scriptingOptions, scriptingConfig.WithPanicCallback(panicCallback))
 		c.tableOptions = append(c.tableOptions, tableConfig.WithPanicCallback(panicCallback))
 		return nil
 	}