Skip to content

Commit a652837

Browse files
committedNov 17, 2024
Require rust >= 1.25 and drop libc_align conditional
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.
1 parent e2dd171 commit a652837

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1348
-1546
lines changed
 

‎Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ rustc-std-workspace-core = { version = "1.0.0", optional = true }
139139
[features]
140140
default = ["std"]
141141
std = []
142-
align = []
143-
rustc-dep-of-std = ['align', 'rustc-std-workspace-core']
142+
rustc-dep-of-std = ["rustc-std-workspace-core"]
144143
extra_traits = []
145144
const-extern-fn = []
146145

‎libc-test/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ ctest2 = "0.4.3"
2424
[features]
2525
default = ["std"]
2626
std = ["libc/std"]
27-
align = ["libc/align"]
2827
extra_traits = ["libc/extra_traits"]
2928

3029
[[test]]

0 commit comments

Comments
 (0)