Skip to content
New issue

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

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

Already on GitHub? # to your account

[0.2] Remove more outdated configuration #4060

Merged
merged 6 commits into from
Nov 16, 2024

Conversation

tgross35
Copy link
Contributor

Cherry pick more from #2845

@rustbot
Copy link
Collaborator

rustbot commented Nov 16, 2024

r? @JohnTitor

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Nov 16, 2024

Some changes occurred in solarish module

cc @jclulow, @pfmooney

Some changes occurred in OpenBSD module

cc @semarie

@rustbot rustbot added the O-wasi label Nov 16, 2024
@tgross35 tgross35 force-pushed the remove-more-cfg branch 3 times, most recently from 61bec0c to 6560731 Compare November 16, 2024 13:08
@tgross35 tgross35 force-pushed the remove-more-cfg branch 3 times, most recently from 4a5ce60 to 12cc98f Compare November 16, 2024 13:44
These are unlikely to get seen.

[ resolve conflicts - Trevor ]
[ resolve conflicts and add test skips that seem to be needed now -
  Trevor ]
Move the `c_void` re-export to the top-level `lib.rs`.
@tgross35 tgross35 enabled auto-merge November 16, 2024 14:21
@tgross35 tgross35 added this pull request to the merge queue Nov 16, 2024
Merged via the queue into rust-lang:libc-0.2 with commit de29a3f Nov 16, 2024
44 checks passed
@tgross35 tgross35 deleted the remove-more-cfg branch November 16, 2024 15:32
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
[ resolve conflicts and add test skips that seem to be needed now -
  Trevor ]

(apply <rust-lang#4060> to `main`)
(cherry picked from commit 23a0d01)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
[ resolve conflicts and add test skips that seem to be needed now -
  Trevor ]

(apply <rust-lang#4060> to `main`)
(cherry picked from commit 23a0d01)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
[ resolve conflicts and add test skips that seem to be needed now -
  Trevor ]

(apply <rust-lang#4060> to `main`)
(cherry picked from commit 23a0d01)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
[ resolve conflicts and add test skips that seem to be needed now -
  Trevor ]

(apply <rust-lang#4060> to `main`)
(cherry picked from commit 23a0d01)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
Move the `c_void` re-export to the top-level `lib.rs`.

(apply <rust-lang#4060> to `main`)
(cherry picked from commit e221887)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
Move the `c_void` re-export to the top-level `lib.rs`.

(apply <rust-lang#4060> to `main`)
(cherry picked from commit e221887)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
[ resolve conflicts and add test skips that seem to be needed now -
  Trevor ]

(apply <rust-lang#4060> to `main`)
(cherry picked from commit 23a0d01)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
Move the `c_void` re-export to the top-level `lib.rs`.

(apply <rust-lang#4060> to `main`)
(cherry picked from commit e221887)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
[ resolve conflicts and add test skips that seem to be needed now -
  Trevor ]

(apply <rust-lang#4060> to `main`)
(cherry picked from commit 23a0d01)

Changes are reduced in this cherry pick compared to the original commit
because some of this was already applied to `main`.
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
Move the `c_void` re-export to the top-level `lib.rs`.

(apply <rust-lang#4060> to `main`)
(cherry picked from commit e221887)

Changes are reduced in this cherry pick compared to the original commit
because some of this was already applied to `main`.
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
[ resolve conflicts, update to latest - Trevor ]

(apply <rust-lang#4060> to `main`)
(cherry picked from commit 9dac79f)

Changes are reduced in this cherry pick compared to the original commit
because some of this was already applied to `main`.
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
[ resolve conflicts - Trevor ]

(apply <rust-lang#4060> to `main`)
(cherry picked from commit 3d97cdf)

No changes in this cherry pick, `main` is already up to date.
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
[ resolve conflicts - Trevor ]

(apply <rust-lang#4060> to `main`)
(cherry picked from commit d00d1de)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
[ resolve conflicts - Trevor ]

(apply <rust-lang#4060> to `main`)
(cherry picked from commit d00d1de)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
[ resolve conflicts - Trevor ]

(apply <rust-lang#4060> to `main`)
(cherry picked from commit d00d1de)
@tgross35 tgross35 added the main-applied This PR was merged against libc-0.2 and main has since been updated to include it label Nov 17, 2024
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants