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

Commit 098facf

Browse files
committed
Merge pull request #143 from saghm/1.0
Update dependencies (including `bson`) and have Travis use latest releases
2 parents faa327b + c858aa8 commit 098facf

File tree

5 files changed

+169
-102
lines changed

5 files changed

+169
-102
lines changed

.travis.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
language: rust
22

33
before_install:
4-
- wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-3.0.7.tgz
5-
- tar xvf mongodb-linux-x86_64-3.0.7.tgz
6-
- mv mongodb-linux-x86_64-3.0.7 3.0.7
7-
- wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-3.2.0.tgz
8-
- tar xvf mongodb-linux-x86_64-3.2.0.tgz
9-
- mv mongodb-linux-x86_64-3.2.0 3.2.0
4+
- wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-3.0.10.tgz
5+
- tar xvf mongodb-linux-x86_64-3.0.10.tgz
6+
- mv mongodb-linux-x86_64-3.0.10 3.0.10
7+
- wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-3.2.4.tgz
8+
- tar xvf mongodb-linux-x86_64-3.2.4.tgz
9+
- mv mongodb-linux-x86_64-3.2.4 3.2.4
1010

1111
env:
1212
- RUST_TEST_THREADS=1
1313

1414
script:
1515
- mkdir -p ./data/db ./data/test ./data/db2 ./data/test2
16-
- 3.0.7/bin/mongod --fork --nopreallocj --dbpath ./data/db --syslog --port 27017
17-
- 3.0.7/bin/mongod --fork --nopreallocj --dbpath ./data/test --syslog --port 27018
16+
- 3.0.10/bin/mongod --fork --nopreallocj --dbpath ./data/db --syslog --port 27017
17+
- 3.0.10/bin/mongod --fork --nopreallocj --dbpath ./data/test --syslog --port 27018
1818
- cargo build --verbose
1919
- cargo test v3_0 --verbose
2020
- killall mongod
21-
- 3.2.0/bin/mongod --fork --nopreallocj --dbpath ./data/db2 --syslog --port 27017
22-
- 3.2.0/bin/mongod --fork --nopreallocj --dbpath ./data/test2 --syslog --port 27018
21+
- 3.2.4/bin/mongod --fork --nopreallocj --dbpath ./data/db2 --syslog --port 27017
22+
- 3.2.4/bin/mongod --fork --nopreallocj --dbpath ./data/test2 --syslog --port 27018
2323
- cargo test v3_2 --verbose

Cargo.lock

Lines changed: 152 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ keywords = ["mongo", "mongodb", "database", "bson", "nosql"]
1313
license = "Apache-2.0"
1414

1515
[dependencies]
16-
bson = "0.1.4"
17-
byteorder = "0.3"
16+
bson = "0.2"
17+
byteorder = "0.5"
1818
chrono = "0.2"
1919
rand = "0.3"
2020
rust-crypto = "0.2.31"
2121
rustc-serialize = "0.3"
2222
scan_fmt = "0.1.0"
23-
separator = "0.3.0"
24-
textnonce = "0.1.1"
23+
separator = "0.3.1"
24+
textnonce = "0.3"
2525
time = "0.1"
2626
bufstream = "0.1.1"
2727

2828
[dev-dependencies]
29-
nalgebra = "0.2"
29+
nalgebra = "0.5"

src/error.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//! MongoDB Errors and Error Codes.
22
use bson::{self, oid};
3-
use byteorder;
43
use coll::error::{WriteException, BulkWriteException};
54
use rustc_serialize::hex;
65
use std::{error, fmt, io, result, sync};
@@ -127,12 +126,6 @@ impl From<io::Error> for Error {
127126
}
128127
}
129128

130-
impl From<byteorder::Error> for Error {
131-
fn from(err: byteorder::Error) -> Error {
132-
Error::IoError(From::from(err))
133-
}
134-
}
135-
136129
impl<T> From<sync::PoisonError<T>> for Error {
137130
fn from(_: sync::PoisonError<T>) -> Error {
138131
Error::PoisonLockError

0 commit comments

Comments
 (0)