Change the LMDB source to point to mdb.master

meilisearch · Jan 11, 2023 · 31e4ddb · 31e4ddb
1 parent 9db1ebc
commit 31e4ddb
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 78 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
-[submodule "lmdb-master3-sys/lmdb"]
-	path = lmdb-master3-sys/lmdb
+[submodule "lmdb-master-sys/lmdb"]
+	path = lmdb-master-sys/lmdb
 	url = https://github.com/LMDB/lmdb
+	branch = mdb.master
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,2 +1,2 @@
 [workspace]
-members = ["lmdb-master3-sys", "heed", "heed-traits", "heed-types"]
+members = ["lmdb-master-sys", "heed", "heed-traits", "heed-types"]
diff --git a/heed/Cargo.toml b/heed/Cargo.toml
@@ -16,7 +16,7 @@ byteorder = { version = "1.4.3", default-features = false }
 heed-traits = { version = "0.7.0", path = "../heed-traits" }
 heed-types = { version = "0.7.2", path = "../heed-types" }
 libc = "0.2.139"
-lmdb-master3-sys = { version = "0.1.0", path = "../lmdb-master3-sys" }
+lmdb-master-sys = { version = "0.1.0", path = "../lmdb-master-sys" }
 once_cell = "1.16.0"
 page_size = "0.5.0"
 serde = { version = "1.0.151", features = ["derive"], optional = true }
@@ -36,7 +36,7 @@ url = "2.3.1"
 default = ["serde", "serde-bincode", "serde-json"]
 
 # Use the provided version of LMDB instead of the one that is installed on the system.
-vendored = ["lmdb-master3-sys/vendored"]
+vendored = ["lmdb-master-sys/vendored"]
 
 # The NO_TLS flag is automatically set on Env opening and
 # RoTxn implements the Sync trait. This allow the user to reference

diff --git a/lmdb-master3-sys/.rustfmt.toml → lmdb-master-sys/.rustfmt.toml b/lmdb-master3-sys/.rustfmt.toml → lmdb-master-sys/.rustfmt.toml
diff --git a/lmdb-master3-sys/Cargo.toml → lmdb-master-sys/Cargo.toml b/lmdb-master3-sys/Cargo.toml → lmdb-master-sys/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "lmdb-master3-sys"
+name = "lmdb-master-sys"
 # NB: When modifying, also modify html_root_url in lib.rs
 version = "0.1.0"
 authors = [
@@ -9,8 +9,8 @@ authors = [
 ]
 license = "Apache-2.0"
 description = "Rust bindings for liblmdb on the mdb.master3 branch."
-documentation = "https://docs.rs/lmdb-master3-sys"
-repository = "https://github.com/meilisearch/heed/tree/main/lmdb-master3-sys"
+documentation = "https://docs.rs/lmdb-master-sys"
+repository = "https://github.com/meilisearch/heed/tree/main/lmdb-master-sys"
 keywords = ["LMDB", "database", "storage-engine", "bindings", "library"]
 categories = ["database", "external-ffi-bindings"]
 edition = "2021"
@@ -19,7 +19,7 @@ edition = "2021"
 build = "build.rs"
 
 [lib]
-name = "lmdb_master3_sys"
+name = "lmdb_master_sys"
 
 [dependencies]
 libc = "0.2.139"

diff --git a/lmdb-master3-sys/bindgen.rs → lmdb-master-sys/bindgen.rs b/lmdb-master3-sys/bindgen.rs → lmdb-master-sys/bindgen.rs
diff --git a/lmdb-master3-sys/build.rs → lmdb-master-sys/build.rs b/lmdb-master3-sys/build.rs → lmdb-master-sys/build.rs
diff --git a/lmdb-master-sys/lmdb b/lmdb-master-sys/lmdb
diff --git a/lmdb-master3-sys/src/bindings.rs → lmdb-master-sys/src/bindings.rs b/lmdb-master3-sys/src/bindings.rs → lmdb-master-sys/src/bindings.rs
diff --git a/lmdb-master3-sys/src/lib.rs → lmdb-master-sys/src/lib.rs b/lmdb-master3-sys/src/lib.rs → lmdb-master-sys/src/lib.rs
diff --git a/...er3-sys/tests/fixtures/testdb-32/data.mdb → ...ter-sys/tests/fixtures/testdb-32/data.mdb b/...er3-sys/tests/fixtures/testdb-32/data.mdb → ...ter-sys/tests/fixtures/testdb-32/data.mdb
diff --git a/...er3-sys/tests/fixtures/testdb-32/lock.mdb → ...ter-sys/tests/fixtures/testdb-32/lock.mdb b/...er3-sys/tests/fixtures/testdb-32/lock.mdb → ...ter-sys/tests/fixtures/testdb-32/lock.mdb
diff --git a/lmdb-master3-sys/tests/lmdb.rs → lmdb-master-sys/tests/lmdb.rs b/lmdb-master3-sys/tests/lmdb.rs → lmdb-master-sys/tests/lmdb.rs
diff --git a/lmdb-master3-sys/tests/simple.rs → lmdb-master-sys/tests/simple.rs b/lmdb-master3-sys/tests/simple.rs → lmdb-master-sys/tests/simple.rs
diff --git a/lmdb-master3-sys/lmdb b/lmdb-master3-sys/lmdb