Merge pull request #297 from mlua-rs/transition_0.20.0

Draft: Transition 0.20.0

Author: jugglerchris

.circleci/config.yml

@@ -6,14 +6,9 @@ orbs:
 jobs:
   build-default:
     docker:
-      - image: cimg/rust:1.70.0
+      - image: cimg/rust:1.75.0
     steps:
       - checkout
-      - run:
-          name: Install libclang for bindgen
-          command: |
-            sudo apt-get update
-            sudo apt-get install libclang-dev clang
       - run:
           name: Version information
           command: rustc --version; cargo --version; rustup --version
@@ -29,12 +24,6 @@ jobs:
       - run:
           name: Run all tests
           command: cargo test --all
-      - run:
-          name: Check bindgen
-          command: |
-              cargo install bindgen-cli
-              scripts/update-bindgen.sh
-              git diff --exit-code || true
       - run:
           name: Check Formatting
           command: |
@@ -48,48 +37,11 @@ jobs:
             - target/debug/build
             - target/debug/deps
           key: cargo-cache-{{ arch }}-{{ checksum "Cargo.lock" }}
-  build-no-oslib:
-    docker:
-      - image: cimg/rust:1.70.0
-    steps:
-      - checkout
-      - run:
-          name: Install libclang for bindgen
-          command: |
-            sudo apt-get update
-            sudo apt-get install libclang-dev clang
-      - run:
-          name: Version information
-          command: rustc --version; cargo --version; rustup --version
-      - run:
-          name: Calculate dependencies
-          command: cargo generate-lockfile
-      - restore_cache:
-          keys:
-            - cargo-cache-no-oslib-{{ arch }}-{{ checksum "Cargo.lock" }}
-      - run:
-          name: Build all targets
-          command: cargo build --features=lua-no-oslib --all --all-targets
-      - run:
-          name: Run all tests
-          command: cargo test --features=lua-no-oslib --all
-      - save_cache:
-          paths:
-            - /usr/local/cargo/registry
-            - target/debug/.fingerprint
-            - target/debug/build
-            - target/debug/deps
-          key: cargo-cache-no-oslib-{{ arch }}-{{ checksum "Cargo.lock" }}
   build-lua53:
     docker:
-      - image: cimg/rust:1.70.0
+      - image: cimg/rust:1.75.0
     steps:
       - checkout
-      - run:
-          name: Install libclang for bindgen
-          command: |
-            sudo apt-get update
-            sudo apt-get install libclang-dev clang
       - run:
           name: Version information
           command: rustc --version; cargo --version; rustup --version
@@ -105,12 +57,6 @@ jobs:
       - run:
           name: Run all tests
           command: cargo test --no-default-features --features=builtin-lua53 --all
-      - run:
-          name: Check bindgen
-          command: |
-              cargo install bindgen-cli
-              scripts/update-bindgen.sh
-              git diff --exit-code || true
       - run:
           name: Check Formatting
           command: |
@@ -126,14 +72,9 @@ jobs:
           key: cargo-cache-lua53-{{ arch }}-{{ checksum "Cargo.lock" }}
   build-lua51:
     docker:
-      - image: cimg/rust:1.70.0
+      - image: cimg/rust:1.75.0
     steps:
       - checkout
-      - run:
-          name: Install libclang for bindgen
-          command: |
-            sudo apt-get update
-            sudo apt-get install libclang-dev clang
       - run:
           name: Install Lua
           command: |
@@ -155,12 +96,6 @@ jobs:
       - run:
           name: Run all tests
           command: cargo test --no-default-features --features=system-lua51 --all
-      - run:
-          name: Check bindgen
-          command: |
-              cargo install bindgen-cli
-              scripts/update-bindgen.sh
-              git diff --exit-code || true
       - run:
           name: Check Formatting
           command: |
@@ -176,14 +111,9 @@ jobs:
           key: cargo-cache-lua51-{{ arch }}-{{ checksum "Cargo.lock" }}
   build-luajit:
     docker:
-      - image: cimg/rust:1.70.0
+      - image: cimg/rust:1.75.0
     steps:
       - checkout
-      - run:
-          name: Install libclang for bindgen
-          command: |
-            sudo apt-get update
-            sudo apt-get install libclang-dev clang
       - run:
           name: Install Lua
           command: |
@@ -257,4 +187,3 @@ workflows:
       - "build-lua51"
       - "build-luajit"
       - "build-windows"
-      - "build-no-oslib"

Cargo.toml

@@ -1,52 +1,40 @@
 [package]
 name = "rlua"
-version = "0.19.8"
+version = "0.20.0"
 authors = ["kyren <[email protected]>"]
 edition = "2018"
 description = "High level bindings to Lua 5.x"
-repository = "https://github.com/amethyst/rlua"
+repository = "https://github.com/mlua-rs/rlua"
 documentation = "https://docs.rs/rlua"
 readme = "README.md"
 keywords = ["lua"]
 license = "MIT"
 categories = [ "api-bindings", "development-tools::ffi" ]
+rust-version = "1.75"
 
 [badges]
-circle-ci = { repository = "amethyst/rlua", branch = "master" }
+circle-ci = { repository = "mlua-rs/rlua", branch = "master" }
+
+[dependencies]
+mlua = { version = "0.9.5", features = ["macros"] }
 
 [features]
 default=["builtin-lua54"]
-builtin-lua54=["rlua-lua54-sys"]
-builtin-lua53=["rlua-lua53-sys"]
-builtin-lua51=["rlua-lua51-sys"]
+builtin-lua54=["mlua/lua54", "mlua/vendored"]
+builtin-lua53=["mlua/lua53", "mlua/vendored"]
+builtin-lua51=["mlua/lua51", "mlua/vendored"]
 
-system-lua54=["rlua-lua54-sys", "rlua-lua54-sys/lua54-pkg-config"]
-system-lua53=["rlua-lua53-sys", "rlua-lua53-sys/lua53-pkg-config"]
-system-lua51=["rlua-lua51-sys", "rlua-lua51-sys/lua51-pkg-config"]
-system-luajit=["rlua-lua51-sys", "rlua-lua51-sys/luajit-pkg-config"]
+system-lua54=["mlua/lua54"]
+system-lua53=["mlua/lua53"]
+system-lua51=["mlua/lua51"]
+system-luajit=["mlua/luajit"]
 
 # Remove Lua's os lib
-lua-no-oslib=["rlua-lua54-sys/lua-no-oslib","rlua-lua53-sys/lua-no-oslib","rlua-lua51-sys/lua-no-oslib"]
+#lua-no-oslib=["rlua-lua54-sys/lua-no-oslib","rlua-lua53-sys/lua-no-oslib","rlua-lua51-sys/lua-no-oslib"]
 
 # Enabled functions from the math module that have been deprecated
-lua-compat-mathlib = []
-
-
-[dependencies]
-libc = { version = "0.2" }
-num-traits = { version = "0.2.14" }
-bitflags = { version = "2.4" }
-bstr = {version = "1.9", features = ["std"], default_features = false }
-rlua-lua54-sys = { version = "0.1.6", optional = true }
-rlua-lua53-sys = { version = "0.1.6", optional = true }
-rlua-lua51-sys = { version = "0.1.6", optional = true }
-
+#lua-compat-mathlib = []
 
 [dev-dependencies]
 rustyline = "13.0"
-criterion = "0.5.1"
-compiletest_rs = { version = "0.10.2", features = ["stable"] }
-
-[[bench]]
-name = "benchmark"
-harness = false
+bstr = "1.9.0"