RUST-435 Export authentication options from the options module (#185)

Author: isabelatkinson

src/client/auth/scram.rs

@@ -635,7 +635,7 @@ impl ServerFinal {
 mod tests {
     use bson::Bson;
 
-    use crate::options::auth::scram::ServerFirst;
+    use super::ServerFirst;
 
     #[cfg_attr(feature = "tokio-runtime", tokio::test)]
     #[cfg_attr(feature = "async-std-runtime", async_std::test)]

src/client/auth/test.rs

@@ -1,6 +1,6 @@
 use lazy_static::lazy_static;
 
-use crate::{cmap::StreamDescription, options::auth::AuthMechanism};
+use crate::{cmap::StreamDescription, options::AuthMechanism};
 
 lazy_static! {
     static ref MECHS: [String; 2] = [

src/options.rs

@@ -16,7 +16,7 @@
 //! ```
 
 pub use crate::{
-    client::{auth, options::*},
+    client::{auth::*, options::*},
     coll::options::*,
     collation::*,
     concern::*,

src/test/client.rs

@@ -5,11 +5,7 @@ use serde::Deserialize;
 
 use crate::{
     error::{Error, ErrorKind},
-    options::{
-        auth::{AuthMechanism, Credential},
-        ClientOptions,
-        ListDatabasesOptions,
-    },
+    options::{AuthMechanism, ClientOptions, Credential, ListDatabasesOptions},
     selection_criteria::{ReadPreference, SelectionCriteria},
     test::{util::TestClient, CLIENT_OPTIONS, LOCK},
     Client,

src/test/spec/auth.rs

@@ -4,10 +4,7 @@ use bson::Document;
 use serde::Deserialize;
 
 use crate::{
-    options::{
-        auth::{AuthMechanism, Credential},
-        ClientOptions,
-    },
+    options::{AuthMechanism, ClientOptions, Credential},
     test::run_spec_test,
 };
 

src/test/util/matchable.rs

@@ -4,7 +4,7 @@ use bson::{Bson, Document};
 
 use crate::{
     bson_util,
-    options::auth::{AuthMechanism, Credential},
+    options::{AuthMechanism, Credential},
 };
 
 pub trait Matchable: Sized + 'static {

src/test/util/mod.rs

@@ -18,7 +18,7 @@ use self::event::EventHandler;
 use super::CLIENT_OPTIONS;
 use crate::{
     error::{CommandError, ErrorKind, Result},
-    options::{auth::AuthMechanism, ClientOptions, CreateCollectionOptions},
+    options::{AuthMechanism, ClientOptions, CreateCollectionOptions},
     Client,
     Collection,
 };