Update for rustc 1.0.0-nightly (44a287e6e 2015-01-08 17:03:40 -0800)

without.crypto
Dan Burkert 10 years ago
parent d8a7b61a12
commit 0b202ecd56
  1. 2
      lmdb-sys/Cargo.toml
  2. 4
      src/cursor.rs
  3. 2
      src/lib.rs
  4. 2
      src/transaction.rs

@ -13,7 +13,7 @@ build = "build.rs"
name = "lmdb-sys" name = "lmdb-sys"
[build-dependencies.rust-bindgen] [build-dependencies.rust-bindgen]
git = "https://github.com/crabtw/rust-bindgen.git" git = "https://github.com/danburkert/rust-bindgen.git"
[build-dependencies.pkg-config] [build-dependencies.pkg-config]
pkg-config = "*" pkg-config = "*"

@ -1,6 +1,6 @@
use libc::{c_void, size_t, c_uint}; use libc::{c_void, size_t, c_uint};
use std::{mem, ptr, raw}; use std::{mem, ptr, raw};
use std::kinds::marker; use std::marker;
use ffi; use ffi;
@ -255,7 +255,7 @@ impl <'txn> Iterator for Iter<'txn> {
// and MDB_EINVAL (and we shouldn't be passing in invalid parameters). // and MDB_EINVAL (and we shouldn't be passing in invalid parameters).
// TODO: validate that these are the only failures possible. // TODO: validate that these are the only failures possible.
debug_assert!(err_code == ffi::MDB_NOTFOUND, 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 None
} }
} }

@ -4,7 +4,7 @@
//! Provides the minimal amount of abstraction necessary to interact with LMDB safely in Rust. In //! 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/). //! 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; #[macro_use] extern crate log;
extern crate libc; extern crate libc;

@ -1,6 +1,6 @@
use libc::{c_uint, c_void, size_t}; use libc::{c_uint, c_void, size_t};
use std::{mem, ptr, raw}; use std::{mem, ptr, raw};
use std::kinds::marker; use std::marker;
use std::io::BufWriter; use std::io::BufWriter;
use ffi; use ffi;

Loading…
Cancel
Save