diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b410280..156ffcd8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Rust - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.90.0 with: components: rustfmt,clippy - name: rustfmt @@ -41,7 +41,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Rust - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.90.0 with: target: ${{ matrix.job.target }} components: clippy @@ -97,7 +97,7 @@ jobs: path: /tmp/ - run: chmod +x /tmp/cross - name: Install Rust - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.90.0 with: target: ${{ matrix.job.target }} - name: Build and Test @@ -116,9 +116,10 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Rust - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.90.0 with: target: x86_64-linux-android + components: clippy - name: Enable KVM run: | echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules diff --git a/Cargo.toml b/Cargo.toml index 9e08d2fb..ca637c28 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ members = [ repository = "https://github.com/rust-minidump/minidump-writer" homepage = "https://github.com/rust-minidump/minidump-writer" edition = "2024" -rust-version = "1.88.0" +rust-version = "1.90.0" license = "MIT" [workspace.dependencies] diff --git a/crates/linux/process-backend/src/local/module_reader.rs b/crates/linux/process-backend/src/local/module_reader.rs index 71c032ef..f7ea40ff 100644 --- a/crates/linux/process-backend/src/local/module_reader.rs +++ b/crates/linux/process-backend/src/local/module_reader.rs @@ -1,4 +1,4 @@ -use super as local; +use super::super::local; use crate::wrapper::{OwnedFd, errno}; use core::{ ffi::{CStr, c_void}, diff --git a/crates/linux/process-backend/src/remote/backend.rs b/crates/linux/process-backend/src/remote/backend.rs index b77b6c9a..f42e36c6 100644 --- a/crates/linux/process-backend/src/remote/backend.rs +++ b/crates/linux/process-backend/src/remote/backend.rs @@ -1,4 +1,4 @@ -use super as remote; +use super::super::remote; use crate::wrapper::Stat; use crate::{Error, ProcessReaderKind, Result}; use core::cell::{Cell, RefCell}; diff --git a/crates/linux/process-backend/src/remote/executor/handler.rs b/crates/linux/process-backend/src/remote/executor/handler.rs index 1c1168f7..c94c4884 100644 --- a/crates/linux/process-backend/src/remote/executor/handler.rs +++ b/crates/linux/process-backend/src/remote/executor/handler.rs @@ -1,7 +1,6 @@ -use super as executor; -use super::remote; +use super::super::executor; use crate::{ProcessReaderKind, regs::*, wrapper::Stat}; -use executor::{Error, Executor, Result}; +use executor::{Error, Executor, Result, remote}; use remote::wire; use wire::{CStrWithNull, HandlesRequests}; diff --git a/crates/linux/process-backend/src/remote/executor/mod.rs b/crates/linux/process-backend/src/remote/executor/mod.rs index 13ef0678..7a11fc39 100644 --- a/crates/linux/process-backend/src/remote/executor/mod.rs +++ b/crates/linux/process-backend/src/remote/executor/mod.rs @@ -1,4 +1,4 @@ -use super as remote; +use super::super::remote; use crate::local; use remote::{transport, wire}; use resources::Pool; diff --git a/crates/linux/process-backend/src/remote/io/unix_stream.rs b/crates/linux/process-backend/src/remote/io/unix_stream.rs index 8c9793d6..46f6a3d9 100644 --- a/crates/linux/process-backend/src/remote/io/unix_stream.rs +++ b/crates/linux/process-backend/src/remote/io/unix_stream.rs @@ -1,4 +1,4 @@ -use super as io; +use super::super::io; use crate::wrapper::{OwnedFd, errno}; use core::ffi::c_int; use io::{Error, Result}; diff --git a/crates/linux/process-backend/src/remote/transport/mod.rs b/crates/linux/process-backend/src/remote/transport/mod.rs index 2343fb88..6bdef4b8 100644 --- a/crates/linux/process-backend/src/remote/transport/mod.rs +++ b/crates/linux/process-backend/src/remote/transport/mod.rs @@ -1,4 +1,4 @@ -use super as remote; +use super::super::remote; use remote::io; use serde::{Deserialize, Serialize}; diff --git a/crates/linux/process-backend/src/remote/transport/postcard.rs b/crates/linux/process-backend/src/remote/transport/postcard.rs index 7aefc7c1..37a4ac25 100644 --- a/crates/linux/process-backend/src/remote/transport/postcard.rs +++ b/crates/linux/process-backend/src/remote/transport/postcard.rs @@ -1,4 +1,4 @@ -use super as transport; +use super::super::transport; use core::{marker::PhantomData, ops::Range}; use remote::io; use serde::{Deserialize, Serialize}; diff --git a/crates/linux/process-backend/src/remote/wire/mod.rs b/crates/linux/process-backend/src/remote/wire/mod.rs index f9acb1ae..f4d631f7 100644 --- a/crates/linux/process-backend/src/remote/wire/mod.rs +++ b/crates/linux/process-backend/src/remote/wire/mod.rs @@ -1,4 +1,4 @@ -use super as remote; +use super::super::remote; use crate::{ProcessReaderKind, regs::*, wrapper::Stat}; use remote::transport; use serde::{Deserialize, Serialize}; diff --git a/src/linux/process_inspection/mod.rs b/src/linux/process_inspection/mod.rs index 6505a04e..fc2b5863 100644 --- a/src/linux/process_inspection/mod.rs +++ b/src/linux/process_inspection/mod.rs @@ -1,4 +1,4 @@ -use super as linux; +use super::super::linux; use crate::module_reader::{ModuleMemoryReadError, ReadError, ReadModuleMemory}; use linux::maps_reader; use process_backend::{ProcessReader as _, Stat, local, regs::*, remote};