Merge branch 'master' into return-error-result-from-iter

Cargo.toml

@@ -1,21 +1,24 @@
 [package]
 
-name = "lmdb"
+name = "lmdb-rkv"
 # NB: When modifying, also modify html_root_url in lib.rs
-version = "0.8.0"
+version = "0.9.0"
 authors = ["Dan Burkert <dan@danburkert.com>"]
 license = "Apache-2.0"
 
 description = "Idiomatic and safe LMDB wrapper."
-repository = "https://github.com/danburkert/lmdb-rs.git"
+repository = "https://github.com/mozilla/lmdb-rs.git"
 readme = "README.md"
-documentation = "https://docs.rs/lmdb"
+documentation = "https://docs.rs/lmdb-rkv"
 keywords = ["LMDB", "database", "storage-engine", "bindings", "library"]
 categories = ["database"]
 
+[lib]
+name = "lmdb"
+
 [badges]
-travis-ci = { repository = "danburkert/lmdb-rs" }
+travis-ci = { repository = "mozilla/lmdb-rs" }
-appveyor = { repository = "danburkert/lmdb-rs" }
+appveyor = { repository = "mozilla/lmdb-rs" }
 
 [workspace]
 members = [
@@ -25,7 +28,7 @@ members = [
 [dependencies]
 bitflags = "1"
 libc = "0.2"
-lmdb-sys = { version = "0.8.0", path = "lmdb-sys" }
+lmdb-sys = "0.8.0"
 
 [dev-dependencies]
 rand = "0.4"

README.md

@@ -1,17 +1,18 @@
-[![Build Status](https://travis-ci.org/danburkert/lmdb-rs.svg?branch=master)](https://travis-ci.org/danburkert/lmdb-rs)
+[![Build Status](https://travis-ci.org/mozilla/lmdb-rs.svg?branch=master)](https://travis-ci.org/mozilla/lmdb-rs)
-[![Windows Build Status](https://ci.appveyor.com/api/projects/status/0bw21yfqsrsv3soh/branch/master?svg=true)](https://ci.appveyor.com/project/danburkert/lmdb-rs/branch/master)
+[![Windows Build status](https://ci.appveyor.com/api/projects/status/id69kkymorycld55/branch/master?svg=true)](https://ci.appveyor.com/project/mykmelez/lmdb-rs-rrsb3/branch/master)
-[![Documentation](https://docs.rs/lmdb/badge.svg)](https://docs.rs/lmdb/)
-[![Crate](https://img.shields.io/crates/v/lmdb.svg)](https://crates.io/crates/lmdb)
 
 # lmdb-rs
 
 Idiomatic and safe APIs for interacting with the
 [Symas Lightning Memory-Mapped Database (LMDB)](http://symas.com/mdb/).
 
+This repo is a fork of [danburkert/lmdb-rs](https://github.com/danburkert/lmdb-rs)
+with fixes for issues encountered by [mozilla/rkv](https://github.com/mozilla/rkv).
+
 ## Building from Source
 
 ```bash
-git clone --recursive git@github.com:danburkert/lmdb-rs.git
+git clone --recursive git@github.com:mozilla/lmdb-rs.git
 cd lmdb-rs
 cargo build
 ```

src/lib.rs

@@ -3,7 +3,7 @@
 
 #![cfg_attr(test, feature(test))]
 #![deny(missing_docs)]
-#![doc(html_root_url = "https://docs.rs/lmdb/0.8.0")]
+#![doc(html_root_url = "https://docs.rs/lmdb-rkv/0.9.0")]
 
 extern crate libc;
 extern crate lmdb_sys as ffi;