update_lint non_reentrant_functions

Signed-off-by: mojave2 <0109chenchen@gmail.com>

Author: kiscad

clippy_lints/src/non_reentrant_functions.rs

@@ -46,8 +46,10 @@ impl EarlyLintPass for NonReentrantFunctions {
 fn is_reentrant_fn(func: &Expr) -> bool {
     match &func.kind {
         ExprKind::Path(_, Path { segments, .. }) => {
-            let seg = segments.iter().last().unwrap();
-            let ident = format!("{:?}", seg.ident);
+            if segments.len() != 2 || !format!("{:?}", segments[0].ident).starts_with("libc#") {
+                return false;
+            }
+            let ident = format!("{:?}", segments[1].ident);
             check_reentrant_by_fn_name(&ident)
         },
         _ => false,

tests/ui/non_reentrant_functions.rs

@@ -1,25 +1,38 @@
 #![warn(clippy::non_reentrant_functions)]
+#![allow(unused)]
 #![feature(rustc_private)]
 extern crate libc;
 
-#[allow(unused)]
-use libc::{c_char, localtime, strtok, time_t};
 use std::ffi::{CStr, CString};
 
-fn main() {
+fn test_libc_localtime() {
     // test code goes here
     unsafe {
-        let _tm = localtime(&0i64 as *const time_t);
+        let _tm = libc::localtime(&0i64 as *const libc::time_t);
     }
+}
 
+fn test_libc_strtok() {
     let string = CString::new("welcome-to-rust").unwrap();
-    let string = string.as_ptr() as *mut c_char;
+    let string = string.as_ptr() as *mut libc::c_char;
     let delim = CString::new(" - ").unwrap();
     let delim = delim.as_ptr();
 
-    let mut token = unsafe { strtok(string, delim) };
+    let mut token = unsafe { libc::strtok(string, delim) };
     while !token.is_null() {
         println!("{:?}", unsafe { CStr::from_ptr(token) });
-        token = unsafe { strtok(std::ptr::null_mut(), delim) };
+        token = unsafe { libc::strtok(std::ptr::null_mut(), delim) };
     }
 }
+
+fn test_locatime() {
+    fn localtime() {}
+    localtime();
+}
+
+fn test_strtok() {
+    fn strtok() {}
+    strtok();
+}
+
+fn main() {}

tests/ui/non_reentrant_functions.stderr

@@ -1,22 +1,22 @@
 error: consider using the reentrant version of the function
-  --> $DIR/non_reentrant_functions.rs:12:19
+  --> $DIR/non_reentrant_functions.rs:11:19
    |
-LL |         let _tm = localtime(&0i64 as *const time_t);
-   |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |         let _tm = libc::localtime(&0i64 as *const libc::time_t);
+   |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: `-D clippy::non-reentrant-functions` implied by `-D warnings`
 
 error: consider using the reentrant version of the function
-  --> $DIR/non_reentrant_functions.rs:20:30
+  --> $DIR/non_reentrant_functions.rs:21:30
    |
-LL |     let mut token = unsafe { strtok(string, delim) };
-   |                              ^^^^^^^^^^^^^^^^^^^^^
+LL |     let mut token = unsafe { libc::strtok(string, delim) };
+   |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: consider using the reentrant version of the function
-  --> $DIR/non_reentrant_functions.rs:23:26
+  --> $DIR/non_reentrant_functions.rs:24:26
    |
-LL |         token = unsafe { strtok(std::ptr::null_mut(), delim) };
-   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |         token = unsafe { libc::strtok(std::ptr::null_mut(), delim) };
+   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 3 previous errors