Skip to content

Enabled ppc64le arch on CI and fixed lint & build issues #677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ jobs:
strategy:
fail-fast: false
matrix:
target: [i686-musl, armv7-musleabihf, aarch64-musl, x86_64-musl]
target: [i686-musl, armv7-musleabihf, aarch64-musl, x86_64-musl, powerpc64le-musl]
container:
image: docker://benfred/rust-musl-cross:${{ matrix.target }}
image: docker://${{ matrix.target == 'powerpc64le-musl' && 'messense' || 'benfred'}}/rust-musl-cross:${{ matrix.target }}
env:
RUSTUP_HOME: /root/.rustup
CARGO_HOME: /root/.cargo
Expand Down
25 changes: 23 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,6 @@ termios = "0.3.3"

[target.'cfg(windows)'.dependencies]
winapi = {version = "0.3", features = ["winbase", "consoleapi", "wincon", "handleapi", "timeapi", "processenv" ]}

[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(unwind)'] }
1 change: 1 addition & 0 deletions src/binary_parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use anyhow::Error;
use goblin::Object;
use memmap::Mmap;

#[allow(dead_code)]
pub struct BinaryInfo {
pub filename: std::path::PathBuf,
pub symbols: HashMap<String, u64>,
Expand Down
2 changes: 1 addition & 1 deletion src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ impl Config {
}

config.subprocesses = matches.occurrences_of("subprocesses") > 0;
config.command = subcommand.to_owned();
subcommand.clone_into(&mut config.command);

// options that can be shared between subcommands
config.pid = matches
Expand Down
2 changes: 1 addition & 1 deletion src/cython.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ impl SourceMaps {
if let Some(map) = self.maps.get(&frame.filename) {
if let Some(map) = map {
if let Some((file, line)) = map.lookup(line) {
frame.filename = file.clone();
frame.filename.clone_from(file);
frame.line = *line as i32;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/python_bindings/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ pub mod pyruntime {
target_arch = "mips"
)
))]
pub fn get_tstate_current_offset(version: &Version) -> Option<usize> {
pub fn get_tstate_current_offset(_version: &Version) -> Option<usize> {
None
}

Expand Down
1 change: 1 addition & 0 deletions src/python_spy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ use crate::stack_trace::{get_gil_threadid, get_stack_trace, StackTrace};
use crate::version::Version;

/// Lets you retrieve stack traces of a running python program
#[allow(dead_code)]
pub struct PythonSpy {
pub pid: Pid,
pub process: Process,
Expand Down
2 changes: 1 addition & 1 deletion src/sampler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ impl Sampler {
let process = process_info
.entry(pid)
.or_insert_with(|| get_process_info(pid, &spies).map(|p| Arc::new(*p)));
trace.process_info = process.clone();
trace.process_info.clone_from(process);
}

// Send the collected info back
Expand Down