Skip to content
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

Move common Linux ptrace definitions to linux_like/mod.rs #3463

Closed
wants to merge 2 commits into from

Conversation

mbyzhang
Copy link
Contributor

@mbyzhang mbyzhang commented Dec 4, 2023

Move common Linux ptrace definitions to linux_like/mod.rs.

@rustbot
Copy link
Collaborator

rustbot commented Dec 4, 2023

r? @JohnTitor

(rustbot has picked a reviewer for you, use r? to override)

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 9, 2023

📌 Commit 62e017f has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Dec 9, 2023

⌛ Testing commit 62e017f with merge 23f6e65...

bors added a commit that referenced this pull request Dec 9, 2023
Move common Linux ptrace definitions to linux_like/mod.rs

Move common Linux ptrace definitions to linux_like/mod.rs.
@bors
Copy link
Contributor

bors commented Dec 9, 2023

💔 Test failed - checks-actions

@bors
Copy link
Contributor

bors commented Dec 10, 2023

☔ The latest upstream changes (presumably #3453) made this pull request unmergeable. Please resolve the merge conflicts.

@JohnTitor
Copy link
Member

Could you check the test failure?
@rustbot author

@tgross35
Copy link
Contributor

@mbyzhang are you able to rebase this so we can figure out the CI and get it merged?

@tgross35
Copy link
Contributor

@mbyzhang ping, this just needs a rebase

pub arch: ::__u32,
pub instruction_pointer: ::__u64,
pub stack_pointer: ::__u64,
#[cfg(libc_union)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This cfg can be removed since it isn't relevant on main anymore

Comment on lines +305 to +306
cfg_if! {
if #[cfg(libc_union)] {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These types can be moved out of the cfg (same reason as above)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants