Skip to content

Commit 618e2c2

Browse files
committed
Auto merge of #3315 - chenx97:test-werror, r=JohnTitor
libc-test: remove useless clone in build.rs To fix recent CI failures
2 parents 28ab9b9 + 548eaf5 commit 618e2c2

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

libc-test/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ fn test_windows(target: &str) {
642642

643643
// Windows uppercase structs don't have `struct` in front:
644644
t if is_struct => {
645-
if ty.clone().chars().next().unwrap().is_uppercase() {
645+
if ty.chars().next().unwrap().is_uppercase() {
646646
t.to_string()
647647
} else if t == "stat" {
648648
"struct __stat64".to_string()

src/unix/linux_like/linux/gnu/b64/aarch64/align.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ s! {
2727
__reserved: [[u64; 32]; 16],
2828
}
2929

30-
#[repr(align(16))]
31-
pub struct user_fpsimd_struct {
32-
pub vregs: [[u64; 2]; 32],
33-
pub fpsr: ::c_uint,
34-
pub fpcr: ::c_uint,
35-
}
36-
3730
#[repr(align(8))]
3831
pub struct clone_args {
3932
pub flags: ::c_ulonglong,
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
s! {
2+
#[repr(align(16))]
3+
pub struct user_fpsimd_struct {
4+
pub vregs: [[u64; 2]; 32],
5+
pub fpsr: ::c_uint,
6+
pub fpcr: ::c_uint,
7+
}
8+
}

src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -928,11 +928,16 @@ cfg_if! {
928928
mod align;
929929
pub use self::align::*;
930930
}
931+
932+
931933
}
932934

933935
cfg_if! {
934936
if #[cfg(libc_int128)] {
935937
mod int128;
936938
pub use self::int128::*;
939+
} else if #[cfg(libc_align)] {
940+
mod fallback;
941+
pub use self::fallback::*;
937942
}
938943
}

0 commit comments

Comments
 (0)