Merge pull request #329 from meilisearch/fix-examples-package

Fix examples package

Author: Kerollmops

convert-to-heed3.sh

@@ -14,12 +14,16 @@ set -e
 # the heed folder...
 if [[ "$OSTYPE" == "cygwin" || "$OSTYPE" == "msys" ]]; then
     cp heed3\\Cargo.toml heed\\Cargo.toml
+    rm -rf heed\\examples
+    cp -R heed3\\examples heed\\examples
 else
     cp heed3/Cargo.toml heed/Cargo.toml
+    rm -rf heed/examples
+    cp -R heed3/examples heed/examples
 fi
 
 # ...and replaces the `heed::` string by the `heed3::` one.
-for file in $(find heed/src -type f -name "*.rs") examples/prev-snapshot.rs; do
+for file in $(find heed/src -type f -name "*.rs"); do
     if [[ "$OSTYPE" == "darwin"* ]]; then
         sed -i '' 's/heed::/heed3::/g' "$file"
     else
@@ -31,6 +35,13 @@ done
 git config --local user.email "[email protected]"
 git config --local user.name "The CI"
 
+# Adds the new examples to the changes
+if [[ "$OSTYPE" == "cygwin" || "$OSTYPE" == "msys" ]]; then
+    git add heed\\examples
+else
+    git add heed/examples
+fi
+
 # But only commit if there is something to commit
 git diff -q --exit-code || git commit -am 'remove-me: heed3 changes generated by the convert-to-heed3.sh script'
 

heed/Cargo.toml

@@ -9,15 +9,6 @@ keywords = ["lmdb", "database", "storage", "typed"]
 categories = ["database", "data-structures"]
 readme = "../README.md"
 edition = "2021"
-include = [
-    "../examples/all-types.rs",
-    "../examples/clear-database.rs",
-    "../examples/cursor-append.rs",
-    "../examples/custom-comparator.rs",
-    "../examples/multi-env.rs",
-    "../examples/nested.rs",
-    "../examples/rmp-serde.rs",
-]
 
 [dependencies]
 bitflags = { version = "2.9.0", features = ["serde"] }
@@ -113,41 +104,30 @@ longer-keys = ["lmdb-master-sys/longer-keys"]
 # <https://github.com/LMDB/lmdb/blob/f20e41de09d97e4461946b7e26ec831d0c24fac7/libraries/liblmdb/mdb.c#L205-L218>
 use-valgrind = ["lmdb-master-sys/use-valgrind"]
 
-# Examples are located outside the standard heed/examples directory to prevent
-# conflicts between heed3 and heed examples when working on both crates.
 [[example]]
 name = "all-types"
-path = "../examples/all-types.rs"
 
 [[example]]
 name = "clear-database"
-path = "../examples/clear-database.rs"
 
 [[example]]
 name = "cursor-append"
-path = "../examples/cursor-append.rs"
 
 [[example]]
 name = "custom-comparator"
-path = "../examples/custom-comparator.rs"
 
 [[example]]
 name = "custom-dupsort-comparator"
-path = "../examples/custom-dupsort-comparator.rs"
 
 [[example]]
 name = "multi-env"
-path = "../examples/multi-env.rs"
 
 [[example]]
 name = "nested"
-path = "../examples/nested.rs"
 
 [[example]]
 name = "prev-snapshot"
-path = "../examples/prev-snapshot.rs"
 
 [[example]]
 name = "rmp-serde"
-path = "../examples/rmp-serde.rs"
 required-features = ["serde-rmp"]