RUST-1937 Remove GridFS re-exports (#1093)

Author: isabelatkinson

src/action/gridfs/delete.rs

@@ -5,7 +5,7 @@ use crate::gridfs::FilesCollectionDocument;
 use crate::{
     action::action_impl,
     error::{ErrorKind, GridFsErrorKind, GridFsFileIdentifier, Result},
-    GridFsBucket,
+    gridfs::GridFsBucket,
 };
 
 impl GridFsBucket {

src/action/gridfs/download.rs

@@ -3,9 +3,12 @@ use bson::{doc, Bson};
 use crate::{
     action::{action_impl, deeplink, option_setters},
     error::{ErrorKind, GridFsErrorKind, GridFsFileIdentifier, Result},
-    gridfs::{FilesCollectionDocument, GridFsDownloadByNameOptions},
-    GridFsBucket,
-    GridFsDownloadStream,
+    gridfs::{
+        FilesCollectionDocument,
+        GridFsBucket,
+        GridFsDownloadByNameOptions,
+        GridFsDownloadStream,
+    },
 };
 
 impl GridFsBucket {

src/action/gridfs/drop.rs

@@ -1,4 +1,4 @@
-use crate::{action::action_impl, error::Result, GridFsBucket};
+use crate::{action::action_impl, error::Result, gridfs::GridFsBucket};
 
 impl GridFsBucket {
     /// Removes all of the files and their associated chunks from this bucket.

src/action/gridfs/find.rs

@@ -6,9 +6,8 @@ use crate::{
     action::{action_impl, deeplink, option_setters},
     coll::options::{FindOneOptions, FindOptions},
     error::Result,
-    gridfs::{FilesCollectionDocument, GridFsFindOneOptions, GridFsFindOptions},
+    gridfs::{FilesCollectionDocument, GridFsBucket, GridFsFindOneOptions, GridFsFindOptions},
     Cursor,
-    GridFsBucket,
 };
 
 impl GridFsBucket {

src/action/gridfs/rename.rs

@@ -1,6 +1,6 @@
 use bson::{doc, Bson};
 
-use crate::{action::action_impl, error::Result, GridFsBucket};
+use crate::{action::action_impl, error::Result, gridfs::GridFsBucket};
 
 impl GridFsBucket {
     /// Renames the file with the given 'id' to the provided `new_filename`. This method returns an

src/action/gridfs/upload.rs

@@ -5,9 +5,7 @@ use crate::gridfs::FilesCollectionDocument;
 use crate::{
     action::{action_impl, deeplink, option_setters},
     error::Result,
-    gridfs::GridFsUploadOptions,
-    GridFsBucket,
-    GridFsUploadStream,
+    gridfs::{GridFsBucket, GridFsUploadOptions, GridFsUploadStream},
 };
 
 impl GridFsBucket {

src/action/shutdown.rs

@@ -14,7 +14,7 @@ impl Client {
     /// see [`immediate`](Shutdown::immediate).  For example:
     ///
     /// ```rust
-    /// # use mongodb::{Client, GridFsBucket, error::Result};
+    /// # use mongodb::{Client, error::Result, gridfs::GridFsBucket};
     /// async fn upload_data(bucket: &GridFsBucket) -> Result<()> {
     ///   let stream = bucket.open_upload_stream("test").await?;
     ///    // .. write to the stream ..

src/lib.rs

@@ -68,7 +68,6 @@ pub use crate::{
         Cursor,
     },
     db::Database,
-    gridfs::{GridFsBucket, GridFsDownloadStream, GridFsUploadStream},
 };
 
 pub use client::session::ClusterTime;