Skip to content
This repository was archived by the owner on Oct 18, 2021. It is now read-only.

Update dependencies (including bson) and have Travis use latest releases #143

Merged
merged 3 commits into from
Apr 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
language: rust

before_install:
- 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
- wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-3.0.10.tgz
- tar xvf mongodb-linux-x86_64-3.0.10.tgz
- mv mongodb-linux-x86_64-3.0.10 3.0.10
- wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-3.2.4.tgz
- tar xvf mongodb-linux-x86_64-3.2.4.tgz
- mv mongodb-linux-x86_64-3.2.4 3.2.4

env:
- RUST_TEST_THREADS=1

script:
- 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
- 3.0.10/bin/mongod --fork --nopreallocj --dbpath ./data/db --syslog --port 27017
- 3.0.10/bin/mongod --fork --nopreallocj --dbpath ./data/test --syslog --port 27018
- cargo build --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
- 3.2.4/bin/mongod --fork --nopreallocj --dbpath ./data/db2 --syslog --port 27017
- 3.2.4/bin/mongod --fork --nopreallocj --dbpath ./data/test2 --syslog --port 27018
- cargo test v3_2 --verbose
207 changes: 152 additions & 55 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ keywords = ["mongo", "mongodb", "database", "bson", "nosql"]
license = "Apache-2.0"

[dependencies]
bson = "0.1.4"
byteorder = "0.3"
bson = "0.2"
byteorder = "0.5"
chrono = "0.2"
rand = "0.3"
rust-crypto = "0.2.31"
rustc-serialize = "0.3"
scan_fmt = "0.1.0"
separator = "0.3.0"
textnonce = "0.1.1"
separator = "0.3.1"
textnonce = "0.3"
time = "0.1"
bufstream = "0.1.1"

[dev-dependencies]
nalgebra = "0.2"
nalgebra = "0.5"
7 changes: 0 additions & 7 deletions src/error.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//! MongoDB Errors and Error Codes.
use bson::{self, oid};
use byteorder;
use coll::error::{WriteException, BulkWriteException};
use rustc_serialize::hex;
use std::{error, fmt, io, result, sync};
Expand Down Expand Up @@ -127,12 +126,6 @@ impl From<io::Error> for Error {
}
}

impl From<byteorder::Error> for Error {
fn from(err: byteorder::Error) -> Error {
Error::IoError(From::from(err))
}
}

impl<T> From<sync::PoisonError<T>> for Error {
fn from(_: sync::PoisonError<T>) -> Error {
Error::PoisonLockError
Expand Down
Loading