DOCSP-31495: specify query technical review (#46)

Author: rustagir

source/fundamentals/crud/read-operations/query.txt

@@ -21,29 +21,31 @@ of documents.
 To match a subset of documents, specify a **query filter** containing
 your **match criteria**. Match criteria consist of the fields and
 values you want documents to match. A query filter contains at least
-one set of match criteria to determine which documents to return. An
-empty query filter matches all of the documents in a collection.
+one set of match criteria to determine which documents to return. If you
+use an empty query filter in a find operation, the driver matches all
+the documents in the collection.
 
 In a query filter, you can match fields with :ref:`literal values
 <rust-literal-values>` or with query operators. Query operators allow
 you to perform mathematical or logical operations to locate documents within a collection.
 
-To match criteria with literal values use the following format:
+To match documents by using literal values, use the following format:
 
 .. code-block:: rust
    :copyable: false
 
    let filter = doc! { "<field>": "<value>" };
 
-To match criteria that include query operators use the following format:
+To create match criteria that include query operators, use the following
+format:
 
 .. code-block:: rust
    :copyable: false
 
    let filter = doc! { "<field>": doc! { "<operator>": "<value>" } };
 
-The examples in the following sections show how to specify queries by using the ``find()``
-method to match documents in a collection.
+The examples in the following sections show how to specify queries by
+using the ``find()`` method to match documents in a collection.
 
 This guide includes the following sections:
 
@@ -71,7 +73,7 @@ This guide includes the following sections:
   query based on the equivalent bits set of a base-10 value
 
 - :ref:`Array <rust-array-operators>`: describes how to query
-  a collection based on data within an array-valued field.
+  a collection based on data within an array-valued field
 
 .. _rust-query-sample-data:
 
@@ -115,20 +117,14 @@ that has the value of ``pear``:
       :language: json
       :visible: false
 
-      {
-         "_id": 4,
-         "name": "pear",
-         "quantity": 28,
-         "vendors": [
-            "A",
-            "C"
-         ]
-      }
+      Document({"_id": Int32(4), "name": String("pear"), "quantity":
+      Int32(28), "vendors": Array([String("A"), String("C")])})
 
 .. note::
 
-   Literal value queries function identically to queries that use the ``$eq`` comparison
-   operator. For example, the following queries are equivalent:
+   Literal value queries function identically to queries that use the
+   ``$eq`` comparison operator. For example, the following queries are
+   equivalent:
 
    .. code-block:: rust
 
@@ -171,25 +167,12 @@ documents with a ``quantity`` value greater than ``5``:
       :language: json
       :visible: false
 
-      {
-        "_id": 1,
-        "name": "orange",
-        "quantity": 7
-      }
-      {
-        "_id": 3,
-        "name": "banana",
-        "quantity": 36
-      }
-      {
-        "_id": 4,
-        "name": "pear",
-        "quantity": 28,
-         "vendors": [
-            "A",
-            "C"
-         ]
-      }
+      Document({"_id": Int32(1), "name": String("orange"), "quantity":
+      Int32(7)})
+      Document({"_id": Int32(3), "name": String("banana"), "quantity":
+      Int32(36)})
+      Document({"_id": Int32(4), "name": String("pear"), "quantity":
+      Int32(28), "vendors": Array([String("A"), String("C")])})
 
 For more information on comparison operators, see :manual:`Comparison
 Query Operators </reference/operator/query-comparison/>` in the Server manual.
@@ -224,11 +207,8 @@ divisible by ``3``:
       :language: json
       :visible: false
 
-      {
-         "_id": 3,
-         "name": "banana",
-         "quantity": 36
-      }
+      Document({"_id": Int32(3), "name": String("banana"), "quantity":
+      Int32(36)})
 
 .. note::
 
@@ -247,7 +227,7 @@ divisible by ``3``:
    .. code-block:: rust
 
       my_coll.find(doc! {
-         $and: vec! [
+         $and: [
             doc! { "price": { "$eq": 5 }},
             doc! { "quantity": { "$gt": 4 }}
          ]
@@ -284,12 +264,8 @@ field:
       :language: json
       :visible: false
 
-      {
-         "_id": 2,
-         "name": "apple",
-         "quantity": 4,
-         "description": "Granny Smith"
-      }
+      Document({"_id": Int32(2), "name": String("apple"), "quantity":
+      Int32(4), "description": String("Granny Smith")})
 
 For a full list of element operators, see :manual:`Element
 Query Operators </reference/operator/query-element/>` in the Server manual.
@@ -324,11 +300,8 @@ for documents with a ``quantity`` value that is divisible by 3:
       :language: json
       :visible: false
 
-      {
-         "_id": 3,
-         "name": "banana",
-         "quantity": 36
-      }
+      Document({"_id": Int32(3), "name": String("banana"), "quantity":
+      Int32(36)})
 
 For a full list of evaluation operators, see :manual:`Evaluation
 Query Operators </reference/operator/query-evaluation/>` in the Server manual.
@@ -362,11 +335,8 @@ bits set as ``7``, which is equivalent to  ``00000111`` in binary:
       :language: json
       :visible: false
 
-      {
-        "_id": 1,
-        "name": "orange",
-        "quantity": 7
-      }
+      Document({"_id": Int32(1), "name": String("orange"), "quantity":
+      Int32(7)})
 
 For a full list of bitwise operators, see :manual:`Bitwise
 Query Operators </reference/operator/query-bitwise/>` in the Server manual.
@@ -399,22 +369,18 @@ The following example matches documents where the ``vendor`` contains
       :language: json
       :visible: false
 
-      {
-         "_id": 4,
-         "name": "pear",
-         "quantity": 28,
-         "vendors": [
-            "A",
-            "C"
-         ]
-      }
+      Document({"_id": Int32(4), "name": String("pear"), "quantity":
+      Int32(28), "vendors": Array([String("A"), String("C")])})
 
 For a full list of bitwise operators, see :manual:`Array
 Query Operators </reference/operator/query-array/>` in the Server manual.
 
 Additional Information
 ----------------------
 
+To learn more about find operations, see the :ref:`rust-retrieve-guide`
+guide.
+
 To learn more about query operators, see :manual:`Query Selectors
 </reference/operator/query/>` in the Server manual.
 

source/includes/fundamentals/code-snippets/crud/query.rs

@@ -1,6 +1,7 @@
+use std::env;
 use bson::Document;
 use futures::TryStreamExt;
-use mongodb::{ bson::doc, Client, Collection, options::{ FindOptions } };
+use mongodb::{ bson::doc, Client, Collection };
 
 #[tokio::main]
 async fn main() -> mongodb::error::Result<()> {
@@ -22,70 +23,63 @@ async fn main() -> mongodb::error::Result<()> {
     //begin-literal
     let query = doc! { "name": "pear" };
     let mut cursor = my_coll.find(query, None).await?;
-    while let Some(result) = cursor.try_next().await? {
-        let doc = bson::from_document(result)?;
-        println!("{}", serde_json::to_string_pretty(&doc).unwrap());
+    while let Some(doc) = cursor.try_next().await? {
+        println!("{:?}", doc);
     }
     //end-literal
     println!("");
     //begin-comparison
     // $gt means "greater than"
     let query = doc! { "quantity": doc! { "$gt": 5 } };
     let mut cursor = my_coll.find(query, None).await?;
-    while let Some(result) = cursor.try_next().await? {
-        let doc = bson::from_document(result)?;
-        println!("{}", serde_json::to_string_pretty(&doc).unwrap());
+    while let Some(doc) = cursor.try_next().await? {
+        println!("{:?}", doc);
     }
     //end-comparison
     println!("");
     //begin-logical
     let query =
-        doc! { "$and": vec! [
+        doc! { "$and": [
            doc! { "quantity": doc! { "$gt": 10 } },
            doc! { "quantity": doc! { "$mod": [ 3, 0 ] } }
        ]
     };
     let mut cursor = my_coll.find(query, None).await?;
-    while let Some(result) = cursor.try_next().await? {
-        let doc = bson::from_document(result)?;
-        println!("{}", serde_json::to_string_pretty(&doc).unwrap());
+    while let Some(doc) = cursor.try_next().await? {
+        println!("{:?}", doc);
     }
     //end-logical
     println!("");
     //begin-element
     let query = doc! { "description": doc! { "$exists": true } };
     let mut cursor = my_coll.find(query, None).await?;
-    while let Some(result) = cursor.try_next().await? {
-        let doc = bson::from_document(result)?;
-        println!("{}", serde_json::to_string_pretty(&doc).unwrap());
+    while let Some(doc) = cursor.try_next().await? {
+        println!("{:?}", doc);
     }
     //end-element
     println!("");
     //begin-evaluation
     // $mod means "modulo" and checks if the remainder is a specific value
     let query = doc! { "quantity": doc! { "$mod": [ 3, 0 ] } };
     let mut cursor = my_coll.find(query, None).await?;
-    while let Some(result) = cursor.try_next().await? {
-        let doc = bson::from_document(result)?;
-        println!("{}", serde_json::to_string_pretty(&doc).unwrap());
+    while let Some(doc) = cursor.try_next().await? {
+        println!("{:?}", doc);
     }
     //end-evaluation
     println!("");
     //begin-bitwise
     let query = doc! { "quantity": doc! { "$bitsAllSet": 7 } };
     let mut cursor = my_coll.find(query, None).await?;
-    while let Some(result) = cursor.try_next().await? {
-        let doc = bson::from_document(result)?;
-        println!("{}", serde_json::to_string_pretty(&doc).unwrap());
+    while let Some(doc) = cursor.try_next().await? {
+        println!("{:?}", doc);
     }
     //end-bitwise
     println!("");
     //begin-array
     let query = doc! { "vendors": doc! { "$elemMatch": { "$eq": "C" } } };
     let mut cursor = my_coll.find(query, None).await?;
-    while let Some(result) = cursor.try_next().await? {
-        let doc = bson::from_document(result)?;
-        println!("{}", serde_json::to_string_pretty(&doc).unwrap());
+    while let Some(doc) = cursor.try_next().await? {
+        println!("{:?}", doc);
     }
     //end-array