Pass clippy.

jmjoy · jmjoy · commit a4fcd955a138 · 2022-05-19T10:06:50.000+08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -69,7 +69,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-          components: rustfmt
+          components: clippy
 
       - name: Cargo fmt
         uses: actions-rs/cargo@v1
@@ -85,6 +85,13 @@ jobs:
           command: build
           args: --release
 
+      - name: Cargo clippy
+        uses: actions-rs/cargo@v1
+        with:
+          toolchain: stable
+          command: clippy
+          args: --release
+
       - name: Cargo test
         uses: actions-rs/cargo@v1
         with:
diff --git a/examples/http-client/src/client.rs b/examples/http-client/src/client.rs
@@ -11,8 +11,8 @@ use phper::{
 use reqwest::blocking::{Client, ClientBuilder, RequestBuilder};
 use std::time::Duration;
 
-const HTTP_CLIENT_BUILDER_CLASS_NAME: &'static str = "HttpClient\\HttpClientBuilder";
-const HTTP_CLIENT_CLASS_NAME: &'static str = "HttpClient\\HttpClient";
+const HTTP_CLIENT_BUILDER_CLASS_NAME: &str = "HttpClient\\HttpClientBuilder";
+const HTTP_CLIENT_CLASS_NAME: &str = "HttpClient\\HttpClient";
 
 pub fn make_client_builder_class() -> DynamicClass<ClientBuilder> {
     let mut class = DynamicClass::new_with_default(HTTP_CLIENT_BUILDER_CLASS_NAME);
diff --git a/examples/http-client/src/errors.rs b/examples/http-client/src/errors.rs
@@ -1,6 +1,6 @@
 use phper::classes::{ClassEntry, DynamicClass};
 
-const EXCEPTION_CLASS_NAME: &'static str = "HttpClient\\HttpClientException";
+const EXCEPTION_CLASS_NAME: &str = "HttpClient\\HttpClientException";
 
 #[derive(Debug, thiserror::Error, phper::Throwable)]
 #[throwable_class(EXCEPTION_CLASS_NAME)]
diff --git a/examples/http-client/src/request.rs b/examples/http-client/src/request.rs
@@ -5,7 +5,7 @@ use phper::{
 };
 use reqwest::blocking::{RequestBuilder, Response};
 
-pub const REQUEST_BUILDER_CLASS_NAME: &'static str = "HttpClient\\RequestBuilder";
+pub const REQUEST_BUILDER_CLASS_NAME: &str = "HttpClient\\RequestBuilder";
 
 pub fn make_request_builder_class() -> DynamicClass<Option<RequestBuilder>> {
     let mut class = DynamicClass::new_with_default(REQUEST_BUILDER_CLASS_NAME);
diff --git a/examples/http-client/src/response.rs b/examples/http-client/src/response.rs
@@ -6,7 +6,7 @@ use phper::{
 };
 use reqwest::blocking::Response;
 
-pub const RESPONSE_CLASS_NAME: &'static str = "HttpClient\\Response";
+pub const RESPONSE_CLASS_NAME: &str = "HttpClient\\Response";
 
 pub fn make_response_class() -> DynamicClass<Option<Response>> {
     let mut class = DynamicClass::new_with_default(RESPONSE_CLASS_NAME);
diff --git a/examples/http-client/src/utils.rs b/examples/http-client/src/utils.rs
@@ -1,10 +1,10 @@
-use std::mem::replace;
+use std::mem::{take, replace};
 
 pub fn replace_and_set<T: Default>(t: &mut T, f: impl FnOnce(T) -> T) {
-    let x = f(replace(t, Default::default()));
+    let x = f(take(t));
     let _ = replace(t, x);
 }
 
 pub fn replace_and_get<T: Default, R>(t: &mut T, f: impl FnOnce(T) -> R) -> R {
-    f(replace(t, Default::default()))
+    f(take(t))
 }
diff --git a/examples/http-server/src/errors.rs b/examples/http-server/src/errors.rs
@@ -2,7 +2,7 @@ use hyper::header::{InvalidHeaderName, InvalidHeaderValue};
 use phper::classes::{ClassEntry, DynamicClass};
 use std::net::AddrParseError;
 
-const EXCEPTION_CLASS_NAME: &'static str = "HttpServer\\HttpServerException";
+const EXCEPTION_CLASS_NAME: &str = "HttpServer\\HttpServerException";
 
 #[derive(Debug, thiserror::Error, phper::Throwable)]
 #[throwable_class(EXCEPTION_CLASS_NAME)]
diff --git a/examples/http-server/src/request.rs b/examples/http-server/src/request.rs
@@ -1,6 +1,6 @@
 use phper::classes::{DynamicClass, Visibility};
 
-pub const HTTP_REQUEST_CLASS_NAME: &'static str = "HttpServer\\HttpRequest";
+pub const HTTP_REQUEST_CLASS_NAME: &str = "HttpServer\\HttpRequest";
 
 pub fn make_request_class() -> DynamicClass<()> {
     let mut class = DynamicClass::new(HTTP_REQUEST_CLASS_NAME);
diff --git a/examples/http-server/src/response.rs b/examples/http-server/src/response.rs
@@ -5,7 +5,7 @@ use phper::{
     functions::Argument,
 };
 
-pub const HTTP_RESPONSE_CLASS_NAME: &'static str = "HttpServer\\HttpResponse";
+pub const HTTP_RESPONSE_CLASS_NAME: &str = "HttpServer\\HttpResponse";
 
 pub fn make_response_class() -> DynamicClass<Response<Body>> {
     let mut class = DynamicClass::new_with_default(HTTP_RESPONSE_CLASS_NAME);
diff --git a/examples/http-server/src/server.rs b/examples/http-server/src/server.rs
@@ -16,7 +16,7 @@ use phper::{
 use std::{convert::Infallible, mem::replace, net::SocketAddr, sync::Arc};
 use tokio::{runtime::Handle, sync::Mutex};
 
-const HTTP_SERVER_CLASS_NAME: &'static str = "HttpServer\\HttpServer";
+const HTTP_SERVER_CLASS_NAME: &str = "HttpServer\\HttpServer";
 
 pub fn make_server_class() -> DynamicClass<Option<Builder<AddrIncoming>>> {
     let mut class = DynamicClass::new_with_default(HTTP_SERVER_CLASS_NAME);
@@ -89,7 +89,7 @@ pub fn make_server_class() -> DynamicClass<Option<Builder<AddrIncoming>>> {
                                             StatusCode::INTERNAL_SERVER_ERROR;
                                         *response.as_mut_state().body_mut() = ex.to_string().into();
                                     }
-                                    Err(e) => Err(e)?,
+                                    Err(e) => return Err(e.into()),
                                     _ => {}
                                 }
 
diff --git a/examples/http-server/src/utils.rs b/examples/http-server/src/utils.rs
@@ -1,10 +1,11 @@
-use std::mem::replace;
+use std::mem::{replace, take};
 
 pub fn replace_and_set<T: Default>(t: &mut T, f: impl FnOnce(T) -> T) {
-    let x = f(replace(t, Default::default()));
+    let x = f(take(t));
     let _ = replace(t, x);
 }
 
+#[inline]
 pub fn replace_and_get<T: Default>(t: &mut T) -> T {
-    replace(t, Default::default())
+    take(t)
 }
diff --git a/phper-alloc/src/lib.rs b/phper-alloc/src/lib.rs
@@ -13,10 +13,10 @@ use std::{
 /// The item which can be placed into container [EBox].
 pub trait EAllocatable {
     /// The method to free the heap allocated by `emalloc`, should call `efree` at the end.
-    fn free(ptr: *mut Self) {
-        unsafe {
-            _efree(ptr.cast());
-        }
+    /// 
+    /// # Safety
+    unsafe fn free(ptr: *mut Self) {
+        _efree(ptr.cast());
     }
 }
 
@@ -43,6 +43,10 @@ impl<T: EAllocatable> EBox<T> {
     }
 
     /// Constructs from a raw pointer.
+    /// 
+    /// # Safety
+    /// 
+    /// Make sure the pointer is created from `emalloc`.
     pub unsafe fn from_raw(raw: *mut T) -> Self {
         Self { ptr: raw }
     }
@@ -73,7 +77,9 @@ impl<T: EAllocatable> DerefMut for EBox<T> {
 
 impl<T: EAllocatable> Drop for EBox<T> {
     fn drop(&mut self) {
-        <T>::free(self.ptr);
+        unsafe {
+            <T>::free(self.ptr);
+        }
     }
 }
 
diff --git a/phper-build/src/lib.rs b/phper-build/src/lib.rs
@@ -1,4 +1,4 @@
-#![warn(rust_2018_idioms, clippy::dbg_macro, clippy::print_stdout)]
+#![warn(rust_2018_idioms, clippy::dbg_macro)]
 #![doc = include_str!("../README.md")]
 
 use phper_sys::*;
@@ -23,11 +23,11 @@ pub fn register_configures() {
         PHP_MAJOR_VERSION, PHP_MINOR_VERSION,
     );
 
-    if PHP_DEBUG > 0 {
+    if PHP_DEBUG != 0 {
         println!("cargo:rustc-cfg=phper_debug");
     }
 
-    if USING_ZTS > 0 {
+    if USING_ZTS != 0 {
         println!("cargo:rustc-cfg=phper_zts");
     }
 }
diff --git a/phper-sys/build.rs b/phper-sys/build.rs
@@ -7,7 +7,7 @@ fn main() {
     println!("cargo:rerun-if-env-changed=PHP_CONFIG");
 
     let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
-    let php_config = env::var("PHP_CONFIG").unwrap_or("php-config".to_string());
+    let php_config = env::var("PHP_CONFIG").unwrap_or_else(|_| "php-config".to_string());
 
     let includes = execute_command(&[php_config.as_str(), "--includes"]);
     let includes = includes.split(' ').collect::<Vec<_>>();
@@ -805,7 +805,7 @@ fn execute_command<S: AsRef<OsStr> + Debug>(argv: &[S]) -> String {
     command.args(&argv[1..]);
     let output = command
         .output()
-        .expect(&format!("Execute command {:?} failed", &argv))
+        .unwrap_or_else(|_| panic!("Execute command {:?} failed", &argv))
         .stdout;
     String::from_utf8(output).unwrap().trim().to_owned()
 }
diff --git a/phper-test/src/cli.rs b/phper-test/src/cli.rs
@@ -19,12 +19,15 @@ use crate::{context::Context, utils};
 pub fn test_php_scripts(exe_path: impl AsRef<Path>, scripts: &[&dyn AsRef<Path>]) {
     let condition = |output: Output| output.status.success();
     let scripts = scripts
-        .into_iter()
+        .iter()
         .map(|s| (*s, &condition as _))
         .collect::<Vec<_>>();
     test_php_scripts_with_condition(exe_path, &*scripts);
 }
 
+/// Script and condition pair.
+pub type ScriptCondition<'a> = (&'a dyn AsRef<Path>, &'a dyn Fn(Output) -> bool);
+
 /// Check your extension by executing the php script, if the all your specified checkers are pass, than the test is pass.
 ///
 /// - `exec_path` is the path of the make executable, which will be used to detect the path of
@@ -35,7 +38,7 @@ pub fn test_php_scripts(exe_path: impl AsRef<Path>, scripts: &[&dyn AsRef<Path>]
 /// See [example logging integration test](https://github.com/jmjoy/phper/blob/master/examples/logging/tests/integration.rs).
 pub fn test_php_scripts_with_condition(
     exe_path: impl AsRef<Path>,
-    scripts: &[(&dyn AsRef<Path>, &dyn Fn(Output) -> bool)],
+    scripts: &[ScriptCondition<'_>],
 ) {
     let context = Context::get_global();
     let lib_path = utils::get_lib_path(exe_path);
diff --git a/phper-test/src/context.rs b/phper-test/src/context.rs
@@ -18,10 +18,10 @@ pub struct Context {
 impl Context {
     pub fn get_global() -> &'static Context {
         static CONTEXT: OnceCell<Context> = OnceCell::new();
-        &CONTEXT.get_or_init(|| {
+        CONTEXT.get_or_init(|| {
             let mut ini_content = String::new();
 
-            let php_config = env::var("PHP_CONFIG").unwrap_or("php-config".to_string());
+            let php_config = env::var("PHP_CONFIG").unwrap_or_else(|_| "php-config".to_string());
             let php_bin = utils::execute_command(&[php_config.as_str(), "--php-binary"]);
             let ini_file = utils::execute_command(&[
                 php_bin.as_str(),
diff --git a/phper-test/src/fpm.rs b/phper-test/src/fpm.rs
@@ -103,7 +103,7 @@ pub fn test_fpm_request(
     block_in_place(move || {
         Handle::current().block_on(async move {
             let root = root.as_ref();
-            let script_name = request_uri.split('?').nth(0).unwrap();
+            let script_name = request_uri.split('?').next().unwrap();
 
             let mut tmp = root.to_path_buf();
             tmp.push(script_name.trim_start_matches('/'));
diff --git a/phper-test/src/utils.rs b/phper-test/src/utils.rs
@@ -13,7 +13,7 @@ pub fn execute_command<S: AsRef<OsStr> + Debug>(argv: &[S]) -> String {
     command.args(&argv[1..]);
     let output = command
         .output()
-        .expect(&format!("Execute command {:?} failed", &argv))
+        .unwrap_or_else(|_| panic!("Execute command {:?} failed", &argv))
         .stdout;
     String::from_utf8(output).unwrap().trim().to_owned()
 }
@@ -26,7 +26,7 @@ pub fn spawn_command<S: AsRef<OsStr> + Debug>(argv: &[S], wait_time: Option<Dura
         .stdout(Stdio::null())
         .stderr(Stdio::null())
         .spawn()
-        .expect(&format!("Execute command {:?} failed", argv));
+        .unwrap_or_else(|_| panic!("Execute command {:?} failed", argv));
 
     // Sleep to wait program running.
     if let Some(wait_time) = wait_time {
diff --git a/phper/src/arrays.rs b/phper/src/arrays.rs
@@ -44,11 +44,21 @@ impl Array {
         }
     }
 
+    /// New Array reference from raw pointer.
+    /// 
+    /// # Safety
+    /// 
+    /// Make sure pointer is the type of `zend_array'.
     pub unsafe fn from_ptr<'a>(ptr: *const zend_array) -> Option<&'a Array> {
         let ptr = ptr as *const Array;
         ptr.as_ref()
     }
 
+    /// New Array mutable reference from raw pointer.
+    /// 
+    /// # Safety
+    /// 
+    /// Make sure pointer is the type of `zend_array'.
     pub unsafe fn from_mut_ptr<'a>(ptr: *mut zend_array) -> Option<&'a mut Array> {
         let ptr = ptr as *mut Array;
         ptr.as_mut()
@@ -62,7 +72,7 @@ impl Array {
         &mut self.inner
     }
 
-    // Add or update item by key.
+    /// Add or update item by key.
     pub fn insert<'a>(&mut self, key: impl Into<InsertKey<'a>>, value: Val) {
         let key = key.into();
         let value = EBox::new(value);
@@ -107,11 +117,33 @@ impl Array {
         }
     }
 
+    // Get item by key.
+    pub fn get_mut<'a>(&mut self, key: impl Into<Key<'a>>) -> Option<&mut Val> {
+        let key = key.into();
+        unsafe {
+            let value = match key {
+                Key::Index(i) => zend_hash_index_find(&self.inner, i),
+                Key::Str(s) => {
+                    zend_hash_str_find(&self.inner, s.as_ptr().cast(), s.len().try_into().unwrap())
+                }
+            };
+            if value.is_null() {
+                None
+            } else {
+                Some(Val::from_mut_ptr(value))
+            }
+        }
+    }
+
     // Get items length.
     pub fn len(&mut self) -> usize {
         unsafe { zend_array_count(&mut self.inner) as usize }
     }
 
+    pub fn is_empty(&mut self) -> bool {
+        self.len() == 0
+    }
+
     pub fn exists<'a>(&self, key: impl Into<Key<'a>>) -> bool {
         let key = key.into();
         unsafe {
@@ -151,19 +183,17 @@ impl Array {
     pub fn iter(&self) -> Iter<'_> {
         Iter {
             index: 0,
-            array: &self,
+            array: self,
         }
     }
 }
 
 impl EAllocatable for Array {
-    fn free(ptr: *mut Self) {
-        unsafe {
+    unsafe fn free(ptr: *mut Self) {
             (*ptr).inner.gc.refcount -= 1;
             if (*ptr).inner.gc.refcount == 0 {
                 zend_array_destroy(ptr.cast());
             }
-        }
     }
 }
 
diff --git a/phper/src/classes.rs b/phper/src/classes.rs
@@ -63,19 +63,16 @@ impl<T: Send + 'static> DynamicClass<T> {
         class_name: impl ToString,
         state_constructor: impl Fn() -> T + Send + Sync + 'static,
     ) -> Self {
-        let dyn_class = Self {
+        Self {
             class_name: class_name.to_string(),
             state_constructor: Arc::new(state_constructor),
             method_entities: Vec::new(),
             property_entities: Vec::new(),
             parent: None,
             _p: Default::default(),
-        };
-
+        }
         // let ptr = &dyn_class.data_constructor as *const _ as usize;
         // dyn_class.add_property(DATA_CONSTRUCTOR_PROPERTY_NAME, ptr.to_string());
-
-        dyn_class
     }
 
     pub fn add_method<F, R>(
diff --git a/phper/src/cmd.rs b/phper/src/cmd.rs
@@ -36,6 +36,7 @@ struct InstallCommand {}
 ///     make();
 /// }
 /// ```
+#[allow(clippy::needless_doctest_main)]
 pub fn make() {
     try_make().expect("make failed");
 }
@@ -76,7 +77,7 @@ fn get_lib_path_and_ext_name() -> crate::Result<(PathBuf, OsString)> {
     let lib_stem = exe_stem
         .to_str()
         .context("failed to generate target lib name")?
-        .replace("-", "_");
+        .replace('-', "_");
     exe_name.push(lib_stem);
     exe_name.push(ext);
 
diff --git a/phper/src/errors.rs b/phper/src/errors.rs
diff --git a/phper/src/functions.rs b/phper/src/functions.rs
diff --git a/phper/src/ini.rs b/phper/src/ini.rs
diff --git a/phper/src/objects.rs b/phper/src/objects.rs
diff --git a/phper/src/strings.rs b/phper/src/strings.rs
diff --git a/phper/src/values.rs b/phper/src/values.rs
diff --git a/tests/integration/src/arrays.rs b/tests/integration/src/arrays.rs
diff --git a/tests/integration/src/objects.rs b/tests/integration/src/objects.rs
diff --git a/tests/integration/src/strings.rs b/tests/integration/src/strings.rs

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`		`-use std::mem::replace;`
	`1`	`+use std::mem::{take, replace};`
`2`	`2`
`3`	`3`	`pub fn replace_and_set<T: Default>(t: &mut T, f: impl FnOnce(T) -> T) {`
`4`		`- let x = f(replace(t, Default::default()));`
	`4`	`+ let x = f(take(t));`
`5`	`5`	`let _ = replace(t, x);`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`pub fn replace_and_get<T: Default, R>(t: &mut T, f: impl FnOnce(T) -> R) -> R {`
`9`		`- f(replace(t, Default::default()))`
	`9`	`+ f(take(t))`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ use phper::{`
`16`	`16`	`use std::{convert::Infallible, mem::replace, net::SocketAddr, sync::Arc};`
`17`	`17`	`use tokio::{runtime::Handle, sync::Mutex};`
`18`	`18`
`19`		`-const HTTP_SERVER_CLASS_NAME: &'static str = "HttpServer\\HttpServer";`
	`19`	`+const HTTP_SERVER_CLASS_NAME: &str = "HttpServer\\HttpServer";`
`20`	`20`
`21`	`21`	`pub fn make_server_class() -> DynamicClass<Option<Builder<AddrIncoming>>> {`
`22`	`22`	`let mut class = DynamicClass::new_with_default(HTTP_SERVER_CLASS_NAME);`
`@@ -89,7 +89,7 @@ pub fn make_server_class() -> DynamicClass<Option<Builder<AddrIncoming>>> {`
`89`	`89`	`StatusCode::INTERNAL_SERVER_ERROR;`
`90`	`90`	`*response.as_mut_state().body_mut() = ex.to_string().into();`
`91`	`91`	`}`
`92`		`- Err(e) => Err(e)?,`
	`92`	`+ Err(e) => return Err(e.into()),`
`93`	`93`	`_ => {}`
`94`	`94`	`}`
`95`	`95`