From 0b202ecd56894b7feae09a852df35cbc09dab23d Mon Sep 17 00:00:00 2001 From: Dan Burkert Date: Sat, 10 Jan 2015 12:30:01 -0800 Subject: [PATCH] Update for rustc 1.0.0-nightly (44a287e6e 2015-01-08 17:03:40 -0800) --- lmdb-sys/Cargo.toml | 2 +- src/cursor.rs | 4 ++-- src/lib.rs | 2 +- src/transaction.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lmdb-sys/Cargo.toml b/lmdb-sys/Cargo.toml index fc35cf4..9964977 100644 --- a/lmdb-sys/Cargo.toml +++ b/lmdb-sys/Cargo.toml @@ -13,7 +13,7 @@ build = "build.rs" name = "lmdb-sys" [build-dependencies.rust-bindgen] -git = "https://github.com/crabtw/rust-bindgen.git" +git = "https://github.com/danburkert/rust-bindgen.git" [build-dependencies.pkg-config] pkg-config = "*" diff --git a/src/cursor.rs b/src/cursor.rs index 451dac9..0feb3f1 100644 --- a/src/cursor.rs +++ b/src/cursor.rs @@ -1,6 +1,6 @@ use libc::{c_void, size_t, c_uint}; use std::{mem, ptr, raw}; -use std::kinds::marker; +use std::marker; use ffi; @@ -255,7 +255,7 @@ impl <'txn> Iterator for Iter<'txn> { // and MDB_EINVAL (and we shouldn't be passing in invalid parameters). // TODO: validate that these are the only failures possible. debug_assert!(err_code == ffi::MDB_NOTFOUND, - "Unexpected LMDB error {}.", LmdbError::from_err_code(err_code)); + "Unexpected LMDB error {:?}.", LmdbError::from_err_code(err_code)); None } } diff --git a/src/lib.rs b/src/lib.rs index 36ea124..90aa80c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,7 +4,7 @@ //! Provides the minimal amount of abstraction necessary to interact with LMDB safely in Rust. In //! general, the API is very similar to the LMDB [C-API](http://symas.com/mdb/doc/). -#![feature(phase, unsafe_destructor)] +#![feature(unsafe_destructor)] #[macro_use] extern crate log; extern crate libc; diff --git a/src/transaction.rs b/src/transaction.rs index c5fac55..e202b98 100644 --- a/src/transaction.rs +++ b/src/transaction.rs @@ -1,6 +1,6 @@ use libc::{c_uint, c_void, size_t}; use std::{mem, ptr, raw}; -use std::kinds::marker; +use std::marker; use std::io::BufWriter; use ffi;