Skip to content

Commit 0f34490

Browse files
committed
Refactor OpenBSD-like module into OpenBSD
1 parent caf17a0 commit 0f34490

File tree

7 files changed

+491
-516
lines changed

7 files changed

+491
-516
lines changed

libc-test/build.rs

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2830,20 +2830,14 @@ fn test_linux(target: &str) {
28302830
cfg.skip_fn(|_| true)
28312831
.skip_const(|_| true)
28322832
.skip_static(|_| true)
2833-
.type_name(move |ty, _is_struct, _is_union| {
2834-
ty.to_string()
2835-
});
2836-
cfg.skip_struct(move |ty| {
2837-
match ty {
2838-
"Elf64_Phdr" | "Elf32_Phdr" => false,
2839-
_ => true,
2840-
}
2833+
.type_name(move |ty, _is_struct, _is_union| ty.to_string());
2834+
cfg.skip_struct(move |ty| match ty {
2835+
"Elf64_Phdr" | "Elf32_Phdr" => false,
2836+
_ => true,
28412837
});
2842-
cfg.skip_type(move |ty| {
2843-
match ty {
2844-
"Elf64_Phdr" | "Elf32_Phdr" => false,
2845-
_ => true,
2846-
}
2838+
cfg.skip_type(move |ty| match ty {
2839+
"Elf64_Phdr" | "Elf32_Phdr" => false,
2840+
_ => true,
28472841
});
28482842
cfg.header("elf.h");
28492843
cfg.generate("../src/lib.rs", "linux_elf.rs");

src/unix/bsd/netbsdlike/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -677,8 +677,8 @@ cfg_if! {
677677
mod netbsd;
678678
pub use self::netbsd::*;
679679
} else if #[cfg(target_os = "openbsd")] {
680-
mod openbsdlike;
681-
pub use self::openbsdlike::*;
680+
mod openbsd;
681+
pub use self::openbsd::*;
682682
} else {
683683
// Unknown target_os
684684
}

0 commit comments

Comments
 (0)