minor updates

Author: qingyang-hu

internal/cmd/compilecheck/main.go

@@ -12,9 +12,13 @@ import (
 	"go.mongodb.org/mongo-driver/v2/bson"
 	"go.mongodb.org/mongo-driver/v2/mongo"
 	"go.mongodb.org/mongo-driver/v2/mongo/options"
+	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/xoptions"
 )
 
 func main() {
+	opts := options.Client()
+	xoptions.SetInternalClientOptions(opts, "foo", "bar")
+
 	_, _ = mongo.Connect(options.Client())
 	fmt.Println(bson.D{{Key: "key", Value: "value"}})
 }

mongo/options/clientoptions.go

@@ -287,13 +287,15 @@ type ClientOptions struct {
 	// encryption.
 	//
 	// Deprecated: This option is for internal use only and should not be set (see GODRIVER-2149). It may be
-	// changed or removed in any release.
+	// changed in any release. This option will be removed in 3.0 and replaced with the Custom options.Options
+	// pattern: SetInternalClientOptions(clientOptions, "crypt", myCrypt)
 	Crypt driver.Crypt
 
 	// Deployment specifies a custom deployment to use for the new Client.
 	//
-	// Deprecated: This option is for internal use only and should not be set. It may be changed or removed in any
-	// release.
+	// Deprecated: This option is for internal use only and should not be set. It may be changed in any release.
+	// This option will be removed in 3.0 and replaced with the Custom options.Options pattern:
+	// SetInternalClientOptions(clientOptions, "deployment", myDeployment)
 	Deployment driver.Deployment
 
 	// Custom specifies internal options for the new Client.

x/mongo/driver/options/options.go x/mongo/driver/xoptions/options.gox/mongo/driver/options/options.go renamed to x/mongo/driver/xoptions/options.go

@@ -4,7 +4,7 @@
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 
-package options
+package xoptions
 
 import (
 	"fmt"

x/mongo/driver/options/options_test.go x/mongo/driver/xoptions/options_test.gox/mongo/driver/options/options_test.go renamed to x/mongo/driver/xoptions/options_test.go

@@ -4,7 +4,7 @@
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 
-package options
+package xoptions
 
 import (
 	"testing"