Skip to content

Commit

Permalink
Auto merge of #3315 - chenx97:test-werror, r=JohnTitor
Browse files Browse the repository at this point in the history
libc-test: remove useless clone in build.rs

To fix recent CI failures
  • Loading branch information
bors committed Aug 15, 2023
2 parents 28ab9b9 + 548eaf5 commit 618e2c2
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion libc-test/build.rs
Expand Up @@ -642,7 +642,7 @@ fn test_windows(target: &str) {

// Windows uppercase structs don't have `struct` in front:
t if is_struct => {
if ty.clone().chars().next().unwrap().is_uppercase() {
if ty.chars().next().unwrap().is_uppercase() {
t.to_string()
} else if t == "stat" {
"struct __stat64".to_string()
Expand Down
7 changes: 0 additions & 7 deletions src/unix/linux_like/linux/gnu/b64/aarch64/align.rs
Expand Up @@ -27,13 +27,6 @@ s! {
__reserved: [[u64; 32]; 16],
}

#[repr(align(16))]
pub struct user_fpsimd_struct {
pub vregs: [[u64; 2]; 32],
pub fpsr: ::c_uint,
pub fpcr: ::c_uint,
}

#[repr(align(8))]
pub struct clone_args {
pub flags: ::c_ulonglong,
Expand Down
8 changes: 8 additions & 0 deletions src/unix/linux_like/linux/gnu/b64/aarch64/fallback.rs
@@ -0,0 +1,8 @@
s! {
#[repr(align(16))]
pub struct user_fpsimd_struct {
pub vregs: [[u64; 2]; 32],
pub fpsr: ::c_uint,
pub fpcr: ::c_uint,
}
}
5 changes: 5 additions & 0 deletions src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
Expand Up @@ -928,11 +928,16 @@ cfg_if! {
mod align;
pub use self::align::*;
}


}

cfg_if! {
if #[cfg(libc_int128)] {
mod int128;
pub use self::int128::*;
} else if #[cfg(libc_align)] {
mod fallback;
pub use self::fallback::*;
}
}

0 comments on commit 618e2c2

Please sign in to comment.