update for rustc 1.0.0-nightly (2e3b0c051 2015-04-01) (built 2015-04-01)

lmdb-sys/Cargo.toml

@@ -9,14 +9,8 @@ repository = "https://github.com/danburkert/lmdb-rs.git"
 readme = "../README.md"
 documentation = "http://rust-ci.org/danburkert/lmdb-rs/doc/lmdb-sys/"
 
-
-links = "lmdb"
 build = "build.rs"
 
-[lib]
-
-name = "lmdb-sys"
-
 [build-dependencies]
 pkg-config = "*"
 gcc = "*"

lmdb-sys/build.rs

@@ -1,4 +1,4 @@
-extern crate "pkg-config" as pkg_config;
+extern crate pkg_config;
 extern crate gcc;
 
 use std::env;
@@ -6,7 +6,7 @@ use std::path::PathBuf;
 
 fn main() {
 
-    let mut lmdb: PathBuf = PathBuf::new(&env::var("CARGO_MANIFEST_DIR").unwrap());
+    let mut lmdb: PathBuf = PathBuf::from(&env::var("CARGO_MANIFEST_DIR").unwrap());
     lmdb.push("mdb");
     lmdb.push("libraries");
     lmdb.push("liblmdb");

lmdb-sys/src/lib.rs

@@ -1,5 +1,5 @@
 #![allow(non_camel_case_types)]
-#![feature(libc, plugin)]
+#![feature(libc)]
 
 extern crate libc;
 

src/lib.rs

@@ -1,11 +1,11 @@
 //! Idiomatic and safe APIs for interacting with the
 //! [Symas Lightning Memory-Mapped Database (LMDB)](http://symas.com/mdb/).
 
-#![feature(core, libc, optin_builtin_traits, std_misc, unsafe_destructor)]
+#![feature(core, libc, optin_builtin_traits, unsafe_destructor)]
-#![cfg_attr(test, feature(test))]
+#![cfg_attr(test, feature(std_misc, test))]
 
 extern crate libc;
-extern crate "lmdb-sys" as ffi;
+extern crate lmdb_sys as ffi;
 
 #[cfg(test)] extern crate rand;
 #[cfg(test)] extern crate tempdir;
@@ -34,7 +34,7 @@ macro_rules! lmdb_try {
     ($expr:expr) => ({
         match $expr {
             ::ffi::MDB_SUCCESS => (),
-            err_code => return Err(::std::error::FromError::from_error(::Error::from_err_code(err_code))),
+            err_code => return Err(::Error::from_err_code(err_code)),
         }
     })
 }
@@ -45,7 +45,7 @@ macro_rules! lmdb_try_with_cleanup {
             ::ffi::MDB_SUCCESS => (),
             err_code => {
                 let _ = $cleanup;
-                return Err(::std::error::FromError::from_error(::Error::from_err_code(err_code)))
+                return Err(::Error::from_err_code(err_code))
             },
         }
     })

src/transaction.rs

@@ -587,7 +587,7 @@ mod test {
         let txn = env.begin_ro_txn().unwrap();
 
         let mut keys: Vec<String> = (0..n).map(|n| get_key(n)).collect();
-        XorShiftRng::new_unseeded().shuffle(keys.as_mut_slice());
+        XorShiftRng::new_unseeded().shuffle(&mut keys[..]);
 
         b.iter(|| {
             let mut i = 0usize;
@@ -606,7 +606,7 @@ mod test {
         let _txn = env.begin_ro_txn().unwrap();
 
         let mut keys: Vec<String> = (0..n).map(|n| get_key(n)).collect();
-        XorShiftRng::new_unseeded().shuffle(keys.as_mut_slice());
+        XorShiftRng::new_unseeded().shuffle(&mut keys[..]);
 
         let dbi = db.dbi();
         let txn = _txn.txn();
@@ -635,7 +635,7 @@ mod test {
         let db = env.open_db(None).unwrap();
 
         let mut items: Vec<(String, String)> = (0..n).map(|n| (get_key(n), get_data(n))).collect();
-        XorShiftRng::new_unseeded().shuffle(items.as_mut_slice());
+        XorShiftRng::new_unseeded().shuffle(&mut items[..]);
 
         b.iter(|| {
             let mut txn = env.begin_rw_txn().unwrap();
@@ -653,7 +653,7 @@ mod test {
         let db = _env.open_db(None).unwrap();
 
         let mut items: Vec<(String, String)> = (0..n).map(|n| (get_key(n), get_data(n))).collect();
-        XorShiftRng::new_unseeded().shuffle(items.as_mut_slice());
+        XorShiftRng::new_unseeded().shuffle(&mut items[..]);
 
         let dbi = db.dbi();
         let env = _env.env();