Merge branch '1.0' of github.com:mongodbinc-interns/mongo-rust-driver-prototype into 1.0

Author: vkarpov15

.travis.yml

@@ -1,16 +1,23 @@
 language: rust
 
 before_install:
-    - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-3.0.3.tgz
-    - tar xvf mongodb-linux-x86_64-3.0.3.tgz
-    - mv mongodb-linux-x86_64-3.0.3 3.0.3
+    - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-3.0.7.tgz
+    - tar xvf mongodb-linux-x86_64-3.0.7.tgz
+    - mv mongodb-linux-x86_64-3.0.7 3.0.7
+    - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-3.2.0.tgz
+    - tar xvf mongodb-linux-x86_64-3.2.0.tgz
+    - mv mongodb-linux-x86_64-3.2.0 3.2.0
 
 env:
     - RUST_TEST_THREADS=1
 
 script:
-    - mkdir -p ./data/db ./data/test
-    - 3.0.3/bin/mongod --fork --nopreallocj --dbpath ./data/db --syslog --port 27017
-    - 3.0.3/bin/mongod --fork --nopreallocj --dbpath ./data/test --syslog --port 27018
+    - mkdir -p ./data/db ./data/test ./data/db2 ./data/test2
+    - 3.0.7/bin/mongod --fork --nopreallocj --dbpath ./data/db --syslog --port 27017
+    - 3.0.7/bin/mongod --fork --nopreallocj --dbpath ./data/test --syslog --port 27018
     - cargo build --verbose
-    - cargo test --verbose
+    - cargo test v3_0 --verbose
+    - killall mongod
+    - 3.2.0/bin/mongod --fork --nopreallocj --dbpath ./data/db2 --syslog --port 27017
+    - 3.2.0/bin/mongod --fork --nopreallocj --dbpath ./data/test2 --syslog --port 27018
+    - cargo test v3_2 --verbose

Cargo.lock

@@ -3,9 +3,11 @@
 MongoDB Rust Driver Prototype
 =============================
 
-This branch contains active development on a new driver written for Rust 1.x.
+This branch contains active development on a new driver written for Rust 1.x and MongoDB 3.0.x.
 
-The API and implementation are currently subject to change at any time. You must not use this driver in production as it is still under development and is in no way supported by MongoDB Inc. We absolutely encourage you to experiment with it and provide us feedback on the API, design, and implementation. Bug reports and suggestions for improvements are welcomed, as are pull requests.
+The API and implementation are currently subject to change at any time. You should not use this driver in production as it is still under development and is in no way supported by MongoDB Inc. We absolutely encourage you to experiment with it and provide us feedback on the API, design, and implementation. Bug reports and suggestions for improvements are welcomed, as are pull requests.
+
+**Note**: This driver currently only supports MongoDB 3.0.x. This driver is **not** expected to work with MongoDB 2.6 or MongoDB 3.2. Do not use this driver if you need support for other versions of MongoDB.
 
 Installation
 ------------

README.md

@@ -121,12 +121,12 @@ impl Cursor {
                     if let Some(&Bson::I32(ref code)) = docs[0].get("code") {
                         // If command doesn't exist or namespace not found, return
                         // an empty array instead of throwing an error.
-                        if *code == ErrorCode::CommandNotFound as i32 ||
-                            *code == ErrorCode::NamespaceNotFound as i32 {
-                                return Ok((docs[0].clone(), v, cid));
-                            } else if let Some(&Bson::String(ref msg)) = docs[0].get("errmsg") {
+                        if *code != ErrorCode::CommandNotFound as i32 &&
+                           *code != ErrorCode::NamespaceNotFound as i32 {
+                            if let Some(&Bson::String(ref msg)) = docs[0].get("errmsg") {
                                 return Err(Error::OperationError(msg.to_owned()));
                             }
+                        }
                     }
                 }
 

src/cursor.rs

@@ -19,6 +19,7 @@ fn create_collection() {
         .expect("Failed to execute list_collections command.");;
 
     let results = cursor.next_n(5).unwrap();
+
     assert_eq!(3, results.len());
 
     match results[0].get("name") {

tests/client/db.rs

@@ -5,9 +5,6 @@ extern crate rand;
 extern crate rustc_serialize;
 extern crate nalgebra;
 
-mod apm;
-mod auth;
-mod client;
 mod json;
-mod sdam;
-mod server_selection;
+mod v3_0;
+mod v3_2;