Merge pull request #35 from saying121/update

Update rust version and fix warnings

Author: BrytonLee

.github/workflows/build-dev-auto-feature.yml

@@ -6,7 +6,6 @@ on:
       - '*'
   pull_request_target:
     types:
-      - edited
       - opened
       - reopened
       - synchronize
@@ -25,18 +24,22 @@ jobs:
           - { os: ubuntu-22.04, triple: x86_64-unknown-linux-gnu , alias: amd64-gnu-ubuntu-22.04 }
           - { os: ubuntu-22.04, triple: x86_64-unknown-linux-musl, alias: amd64-musl-ubuntu-22.04 }
 
+    env:
+      SCCACHE_GHA_ENABLED: "true"
+      RUSTC_WRAPPER: "sccache"
+
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Setup Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: actions-rs/toolchain@v2
         with:
           profile: minimal
           override: true
-          toolchain: 1.75.0
+          toolchain: 1.85
           components: rustfmt, clippy
 
       - name: Show environment information
@@ -49,13 +52,13 @@ jobs:
           uname -a
           cat /usr/include/linux/version.h
 
-      - name: Setup Rust cache
-        uses: Swatinem/rust-cache@v2
+      - name: Setup build cache
+        uses: mozilla-actions/[email protected]
         with:
-          prefix-key: ${{ matrix.target.alias }}
+          version: 'v0.10.0'
 
       - name: Cache APT packages
-        uses: awalsh128/cache-apt-pkgs-action@v1.3.1
+        uses: awalsh128/cache-apt-pkgs-action@latest
         with:
           packages: musl-tools
           version: 1.0
@@ -93,4 +96,4 @@ jobs:
           target: ${{ matrix.target.triple }}
           feature: auto
 
-      # TODO: Some tests will fail in GitHub Actions environment
+      # TODO: Some tests will fail in GitHub Actions environment

.github/workflows/build-dev.yml

@@ -6,7 +6,6 @@ on:
       - '*'
   pull_request_target:
     types:
-      - edited
       - opened
       - reopened
       - synchronize
@@ -28,18 +27,22 @@ jobs:
           - { pkg: linux-source-6.2.0 , alias: 6.2 , feature: linux-6.0 }
           - { pkg: linux-source-6.5.0 , alias: 6.5 , feature: linux-6.3 }
 
+    env:
+      SCCACHE_GHA_ENABLED: "true"
+      RUSTC_WRAPPER: "sccache"
+
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Setup Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: actions-rs/toolchain@v2
         with:
           profile: minimal
           override: true
-          toolchain: 1.75.0
+          toolchain: 1.85
           components: rustfmt, clippy
 
       - name: Show environment information
@@ -51,13 +54,13 @@ jobs:
           rustc -V
           uname -a
 
-      - name: Setup Rust cache
-        uses: Swatinem/rust-cache@v2
+      - name: Setup build cache
+        uses: mozilla-actions/[email protected]
         with:
-          prefix-key: ${{ matrix.target.alias }}
+          version: 'v0.10.0'
 
       - name: Cache APT packages
-        uses: awalsh128/cache-apt-pkgs-action@v1.3.1
+        uses: awalsh128/cache-apt-pkgs-action@latest
         with:
           packages: musl-tools ${{ matrix.linux-source.pkg }}
           version: 1.0
@@ -105,4 +108,4 @@ jobs:
         env:
           LINUX_HEADERS_PATH: ${{ github.workspace }}/linux-headers
 
-      # TODO: Some tests will fail in GitHub Actions environment
+      # TODO: Some tests will fail in GitHub Actions environment

build/helpers.rs

@@ -12,9 +12,10 @@
 // You should have received a copy of the GNU Lesser General Public License along with Perf-event-rs. If not,
 // see <https://www.gnu.org/licenses/>.
 
-use crate::consts::IOCTLS;
 use std::fs;
 
+use crate::consts::IOCTLS;
+
 /// Parse `LINUX_VERSION_CODE` of `linux/version.h` to (major, patch_level, sub_level)
 pub fn parse_linux_version_h(path: &str) -> (usize, usize, usize) {
     let first_line = fs::read_to_string(path)

build/main.rs

@@ -17,10 +17,12 @@ mod helpers;
 
 extern crate bindgen;
 
-use crate::consts::LINUX_FEATURE_VERSIONS;
-use crate::helpers::{bindgen, parse_linux_version_h};
-use std::env;
-use std::path::Path;
+use std::{env, path::Path};
+
+use crate::{
+    consts::LINUX_FEATURE_VERSIONS,
+    helpers::{bindgen, parse_linux_version_h},
+};
 
 fn main() {
     // Check target OS

rust-toolchain.toml

@@ -0,0 +1,4 @@
+[toolchain]
+channel = "1.85"
+components = ["rustfmt", "clippy"]
+profile = "minimal"

src/infra/box.rs

@@ -12,8 +12,10 @@
 // You should have received a copy of the GNU Lesser General Public License along with Perf-event-rs. If not,
 // see <https://www.gnu.org/licenses/>.
 
-use std::alloc::{alloc, Layout};
-use std::ptr;
+use std::{
+    alloc::{alloc, Layout},
+    ptr,
+};
 
 pub trait WrapBox<T> {
     #[inline]
@@ -36,6 +38,6 @@ impl<T> BoxSliceExt for Box<[T]> {
         let layout = Layout::array::<u8>(len).unwrap();
         let ptr = unsafe { alloc(layout) };
         let slice = ptr::slice_from_raw_parts(ptr, len);
-        unsafe { Self::from_raw(std::mem::transmute(slice)) }
+        unsafe { Self::from_raw(std::mem::transmute::<*const [u8], *mut [T]>(slice)) }
     }
 }

src/infra/vla.rs

@@ -12,8 +12,7 @@
 // You should have received a copy of the GNU Lesser General Public License along with Perf-event-rs. If not,
 // see <https://www.gnu.org/licenses/>.
 
-use std::marker::PhantomData;
-use std::slice;
+use std::{marker::PhantomData, slice};
 
 #[repr(C)]
 pub struct Vla<L, T> {
@@ -114,7 +113,7 @@ mod tests {
     fn test_vla_u8_u8() {
         let buf = [2, 1, 2, 3, 4, 5_u8];
         let len_ptr = &buf[0] as *const u8;
-        let vla: &Vla<u8, u8> = unsafe { &*Vla::from_ptr(len_ptr) };
+        let vla: &Vla<u8, u8> = unsafe { Vla::from_ptr(len_ptr) };
 
         assert_eq!(vla.as_slice(), &buf[1..3])
     }
@@ -126,7 +125,7 @@ mod tests {
 
         let buf = Wrapper([2, 0, 0, 0, 1, 2, 3, 4, 5_u8]);
         let len_ptr = &buf.0[0] as *const _ as *const u32;
-        let vla: &Vla<u32, u8> = unsafe { &*Vla::from_ptr(len_ptr) };
+        let vla: &Vla<u32, u8> = unsafe { Vla::from_ptr(len_ptr) };
 
         assert_eq!(vla.as_slice(), &buf.0[4..6])
     }

src/infra/zt.rs

@@ -12,11 +12,9 @@
 // You should have received a copy of the GNU Lesser General Public License along with Perf-event-rs. If not,
 // see <https://www.gnu.org/licenses/>.
 
+use std::{marker::PhantomData, mem::size_of, ops::Not, slice};
+
 use crate::infra::SizedExt;
-use std::marker::PhantomData;
-use std::mem::size_of;
-use std::ops::Not;
-use std::slice;
 
 #[repr(C)]
 pub struct ZeroTerminated<T> {

src/lib.rs

@@ -13,8 +13,6 @@
 // see <https://www.gnu.org/licenses/>.
 
 #![cfg(target_os = "linux")]
-#![deny(warnings)]
-#![warn(clippy::all, clippy::nursery, clippy::cargo_common_metadata)]
 
 mod infra;
 mod perf_event;

src/perf_event/config.rs

@@ -13,6 +13,7 @@
 // see <https://www.gnu.org/licenses/>.
 
 use std::{io, result};
+
 use thiserror::Error;
 
 #[derive(Error, Debug)]