Merge pull request #26 from jmjoy/0.3.x-dev

jmjoy · web-flow · commit bd49d1af6c57 · 2021-10-23T15:45:27.000+08:00
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ A library that allows us to write PHP extensions using pure Rust and using safe
 
 ### Necessary
 
-- **rust** 1.54 or later
+- **rust** 1.56 or later
 - **libclang** 9.0 or later
 - **php** 7.0 or later
 
diff --git a/examples/hello/Cargo.toml b/examples/hello/Cargo.toml
@@ -2,7 +2,8 @@
 name = "hello"
 version = "0.0.0"
 authors = ["jmjoy <918734043@qq.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 publish = false
 license = "Unlicense"
 
diff --git a/examples/http-client/Cargo.toml b/examples/http-client/Cargo.toml
@@ -2,7 +2,8 @@
 name = "http-client"
 version = "0.0.0"
 authors = ["jmjoy <918734043@qq.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 publish = false
 license = "Unlicense"
 
diff --git a/examples/http-server/Cargo.toml b/examples/http-server/Cargo.toml
@@ -2,7 +2,8 @@
 name = "http-server"
 version = "0.0.0"
 authors = ["jmjoy <918734043@qq.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 publish = false
 license = "Unlicense"
 
diff --git a/examples/logging/Cargo.toml b/examples/logging/Cargo.toml
@@ -2,7 +2,8 @@
 name = "logging"
 version = "0.0.0"
 authors = ["jmjoy <918734043@qq.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 publish = false
 license = "Unlicense"
 
diff --git a/phper-alloc/Cargo.toml b/phper-alloc/Cargo.toml
@@ -2,7 +2,8 @@
 name = "phper-alloc"
 version = "0.3.0"
 authors = ["jmjoy <918734043@qq.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 description = "Alloc related items for phper crate."
 repository = "https://github.com/jmjoy/phper.git"
 license = "Unlicense"
diff --git a/phper-build/Cargo.toml b/phper-build/Cargo.toml
@@ -2,7 +2,8 @@
 name = "phper-build"
 version = "0.3.0"
 authors = ["jmjoy <918734043@qq.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 description = "Generates stubs for project using phper."
 repository = "https://github.com/jmjoy/phper.git"
 license = "Unlicense"
diff --git a/phper-macros/Cargo.toml b/phper-macros/Cargo.toml
@@ -2,7 +2,8 @@
 name = "phper-macros"
 version = "0.3.0"
 authors = ["jmjoy <918734043@qq.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 description = "The proc-macros for phper crate."
 repository = "https://github.com/jmjoy/phper.git"
 license = "Unlicense"
diff --git a/phper-sys/Cargo.toml b/phper-sys/Cargo.toml
@@ -2,7 +2,8 @@
 name = "phper-sys"
 version = "0.3.0"
 authors = ["jmjoy <918734043@qq.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 description = "Low level PHP binding for Rust."
 repository = "https://github.com/jmjoy/phper.git"
 license = "Unlicense"
diff --git a/phper-test/Cargo.toml b/phper-test/Cargo.toml
@@ -2,7 +2,8 @@
 name = "phper-test"
 version = "0.3.0"
 authors = ["jmjoy <918734043@qq.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 description = "PHPer testing utilities."
 repository = "https://github.com/jmjoy/phper.git"
 license = "Unlicense"
@@ -24,4 +25,3 @@ tokio = { version = "1.7.0", optional = true }
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
 all-features = true
-
diff --git a/phper/Cargo.toml b/phper/Cargo.toml
@@ -2,7 +2,8 @@
 name = "phper"
 version = "0.3.0"
 authors = ["jmjoy <918734043@qq.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 description = "A library that allows us to write PHP extensions using pure Rust and using safe Rust whenever possible."
 repository = "https://github.com/jmjoy/phper.git"
 documentation = "https://docs.rs/phper"
@@ -14,7 +15,7 @@ keywords = ["php", "binding", "extension", "module"]
 
 [dependencies]
 anyhow = "1.0.40"
-clap = "3.0.0-beta.2"
+clap = "3.0.0-beta.5"
 dashmap = "4.0.2"
 derive_more = "0.99.13"
 indexmap = "1.6.2"
diff --git a/phper/src/cmd.rs b/phper/src/cmd.rs
@@ -2,7 +2,7 @@
 
 use crate::sys::PHP_EXTENSION_DIR;
 use anyhow::Context;
-use clap::Clap;
+use clap::Parser;
 use std::{
     env,
     ffi::{CStr, OsString},
@@ -11,18 +11,18 @@ use std::{
 };
 
 /// Make utility.
-#[derive(Clap)]
+#[derive(Parser)]
 struct Make {
     #[clap(subcommand)]
     sub: SubCommand,
 }
 
-#[derive(Clap)]
+#[derive(Parser)]
 enum SubCommand {
     Install(InstallCommand),
 }
 
-#[derive(Clap)]
+#[derive(Parser)]
 struct InstallCommand {}
 
 /// Make.
diff --git a/tests/integration/Cargo.toml b/tests/integration/Cargo.toml
@@ -2,7 +2,8 @@
 name = "integration"
 version = "0.0.0"
 authors = ["jmjoy <918734043@qq.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 publish = false
 license = "Unlicense"
 
