*: make CI green again

Signed-off-by: Jay Lee <[email protected]>

Author: BusyJay

jemalloc-ctl/src/keys.rs

@@ -46,7 +46,6 @@ pub trait AsName {
 
 impl AsName for [u8] {
     fn name(&self) -> &Name {
-        use str;
         assert!(
             !self.is_empty(),
             "cannot create Name from empty byte-string"
@@ -125,14 +124,12 @@ impl Name {
 
 impl fmt::Debug for Name {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        use str;
         write!(f, "{}", str::from_utf8(&self.0).unwrap())
     }
 }
 
 impl fmt::Display for Name {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        use str;
         write!(f, "{}", str::from_utf8(&self.0).unwrap())
     }
 }

src/lib.rs

@@ -60,7 +60,7 @@ const alignof_max_align_t: usize = 8;
     target_arch = "s390x",
     target_arch = "sparc64"
 )))]
-const alignof_max_align_t: usize = 16;
+const ALIGNOF_MAX_ALIGN_T: usize = 16;
 
 /// If `align` is less than `_Alignof(max_align_t)`, and if the requested
 /// allocation `size` is larger than the alignment, we are guaranteed to get a
@@ -69,7 +69,7 @@ const alignof_max_align_t: usize = 16;
 ///
 /// Otherwise, it returns the alignment flag to pass to the jemalloc APIs.
 fn layout_to_flags(align: usize, size: usize) -> c_int {
-    if align <= alignof_max_align_t && align <= size {
+    if align <= ALIGNOF_MAX_ALIGN_T && align <= size {
         0
     } else {
         ffi::MALLOCX_ALIGN(align)
@@ -122,7 +122,7 @@ unsafe impl GlobalAlloc for Jemalloc {
 
     #[inline]
     unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
-        assume!(!ptr.is_null())
+        assume!(!ptr.is_null());
         assume!(layout.size() != 0);
         let flags = layout_to_flags(layout.align(), layout.size());
         ffi::sdallocx(ptr as *mut c_void, layout.size(), flags)

systest/Cargo.toml

@@ -9,4 +9,4 @@ jemalloc-sys = { path = "../jemalloc-sys" }
 libc = "0.2"
 
 [build-dependencies]
-ctest = "^0.2.6"
+ctest = "0.2.22"

systest/build.rs

@@ -3,6 +3,17 @@ extern crate ctest;
 use std::env;
 use std::path::PathBuf;
 
+const FUNCTION_POINTER: &[&str] = &[
+    "extent_alloc_t",
+    "extent_dalloc_t",
+    "extent_destroy_t",
+    "extent_commit_t",
+    "extent_decommit_t",
+    "extent_purge_t",
+    "extent_split_t",
+    "extent_merge_t",
+];
+
 fn main() {
     let root = PathBuf::from(env::var_os("DEP_JEMALLOC_ROOT").unwrap());
 
@@ -11,7 +22,9 @@ fn main() {
         .include(root.join("include"))
         .cfg("prefixed", None)
         .fn_cname(|rust, link_name| link_name.unwrap_or(rust).to_string())
-        .skip_signededness(|c| c.ends_with("_t"));
+        .skip_signededness(|c| c.ends_with("_t"))
+        // No need to test pure C function pointer.
+        .skip_type(|name| FUNCTION_POINTER.contains(&name));
 
     if cfg!(target_os = "linux") {
         cfg.skip_fn(|f| f == "malloc_usable_size");