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.

Sign up for GitHub

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

Jump to bottom

[0.2] Require rust >= 1.25 and drop libc_align conditional #4057

Merged
merged 1 commit into from
Nov 16, 2024
Merged

[0.2] Require rust >= 1.25 and drop libc_align conditional #4057

merged 1 commit into from
Nov 16, 2024

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Nov 16, 2024 •
edited
Loading

This is mostly taken from Josh's work at 1, I just updated to account for conflicts and new uses of libc_align.

@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

@tgross35 tgross35 force-pushed the remove-cfg-align branch 5 times, most recently from 5e313e8 to 72d962b Compare November 16, 2024 11:29
@bors
Copy link
Contributor

bors commented Nov 16, 2024

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

@tgross35 tgross35 force-pushed the remove-cfg-align branch 6 times, most recently from 34af772 to 0663f8d Compare November 16, 2024 12:21
@tgross35 tgross35 enabled auto-merge November 16, 2024 12:38
@tgross35 @joshtriplett
Require rust >= 1.25 and drop libc_align conditional
b5b553d 
This is mostly taken from Josh's work at [1], I just updated to account
for conflicts and new uses of `libc_align`.

[1]: rust-lang#2845

Co-authored-by: Josh Triplett <josh@joshtriplett.org>
@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 3807bd3 Nov 16, 2024
44 checks passed
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@tgross35
Require rust >= 1.25 and drop libc_align conditional
06a2c2f 
This is mostly taken from Josh's work at [1], I just updated to account
for conflicts and new uses of `libc_align`.

[1]: rust-lang#2845

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

(apply <rust-lang#4057> to `main`)
(cherry picked from commit b5b553d)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@tgross35
Require rust >= 1.25 and drop libc_align conditional
669dcbc 
This is mostly taken from Josh's work at [1], I just updated to account
for conflicts and new uses of `libc_align`.

[1]: rust-lang#2845

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

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

As part of this update, drop the `align` feature from Cargo.toml and
libc-test.
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@tgross35
Require rust >= 1.25 and drop libc_align conditional
c4ac02b 
This is mostly taken from Josh's work at [1], I just updated to account
for conflicts and new uses of `libc_align`.

[1]: rust-lang#2845

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

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

As part of this update, drop the `align` feature from Cargo.toml and
libc-test.
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@tgross35
Require rust >= 1.25 and drop libc_align conditional
f938a7e 
This is mostly taken from Josh's work at [1], I just updated to account
for conflicts and new uses of `libc_align`.

[1]: rust-lang#2845

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

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

As part of this update, drop the `align` feature from Cargo.toml and
libc-test.
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@tgross35
Require rust >= 1.25 and drop libc_align conditional
5770a77 
This is mostly taken from Josh's work at [1], I just updated to account
for conflicts and new uses of `libc_align`.

[1]: rust-lang#2845

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

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

As part of this update, drop the `align` feature from Cargo.toml and
libc-test.
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@tgross35
Require rust >= 1.25 and drop libc_align conditional
c788a2d 
This is mostly taken from Josh's work at [1], I just updated to account
for conflicts and new uses of `libc_align`.

[1]: rust-lang#2845

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

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

As part of this update, drop the `align` feature from Cargo.toml and
libc-test.
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@tgross35
Require rust >= 1.25 and drop libc_align conditional
d8b4dfb 
This is mostly taken from Josh's work at [1], I just updated to account
for conflicts and new uses of `libc_align`.

[1]: rust-lang#2845

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

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

As part of this update, drop the `align` feature from Cargo.toml and
libc-test.
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@tgross35
Require rust >= 1.25 and drop libc_align conditional
2d91c38 
This is mostly taken from Josh's work at [1], I just updated to account
for conflicts and new uses of `libc_align`.

[1]: rust-lang#2845

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

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

As part of this update, drop the `align` feature from Cargo.toml and
libc-test.
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@tgross35
Require rust >= 1.25 and drop libc_align conditional
284a5c4 
This is mostly taken from Josh's work at [1], I just updated to account
for conflicts and new uses of `libc_align`.

[1]: rust-lang#2845

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

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

As part of this update, drop the `align` feature from Cargo.toml and
libc-test.
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@tgross35
Require rust >= 1.25 and drop libc_align conditional
3e30c8b 
This is mostly taken from Josh's work at [1], I just updated to account
for conflicts and new uses of `libc_align`.

[1]: rust-lang#2845

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

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

As part of this update, drop the `align` feature from Cargo.toml and
libc-test.
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@tgross35
Require rust >= 1.25 and drop libc_align conditional
a652837 
This is mostly taken from Josh's work at [1], I just updated to account
for conflicts and new uses of `libc_align`.

[1]: rust-lang#2845

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

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

As part of this update, drop the `align` feature from Cargo.toml and
libc-test.
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@tgross35
Require rust >= 1.25 and drop libc_align conditional
bf19e3e 
This is mostly taken from Josh's work at [1], I just updated to account
for conflicts and new uses of `libc_align`.

[1]: rust-lang#2845

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

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

As part of this update, drop the `align` feature from Cargo.toml and
libc-test.
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@tgross35
Require rust >= 1.25 and drop libc_align conditional
30809c5 
This is mostly taken from Josh's work at [1], I just updated to account
for conflicts and new uses of `libc_align`.

[1]: rust-lang#2845

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

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

As part of this update, drop the `align` feature from Cargo.toml and
libc-test.
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@tgross35
Require rust >= 1.25 and drop libc_align conditional
e703c85 
This is mostly taken from Josh's work at [1], I just updated to account
for conflicts and new uses of `libc_align`.

[1]: rust-lang#2845

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

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

As part of this update, drop the `align` feature from Cargo.toml and
libc-test.

Changes are reduced in this cherry pick compared to the original commit
because some of this was already applied to `main`.
@tgross35 tgross35 mentioned this pull request Nov 17, 2024
Merged
@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
@tgross35 tgross35 deleted the remove-cfg-align branch November 17, 2024 07:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@JohnTitor JohnTitor

Labels
main-applied This PR was merged against libc-0.2 and main has since been updated to include it O-android O-arm O-gnu O-linux O-macos O-mips O-musl O-newlib O-riscv O-solarish O-sparc O-unix O-windows O-x86 S-waiting-on-review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tgross35 @rustbot @bors @JohnTitor