Refactor OpenBSD-like module into OpenBSD

rust-lang · May 22, 2019 · 7b45788 · 7b45788
1 parent 50f4b67
commit 7b45788
Show file tree

Hide file tree

Showing 7 changed files with 490 additions and 516 deletions.
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -2815,20 +2815,14 @@ fn test_linux(target: &str) {
     cfg.skip_fn(|_| true)
         .skip_const(|_| true)
         .skip_static(|_| true)
-        .type_name(move |ty, _is_struct, _is_union| {
-            ty.to_string()
-        });
-    cfg.skip_struct(move |ty| {
-        match ty {
-            "Elf64_Phdr" | "Elf32_Phdr" => false,
-            _ => true,
-        }
+        .type_name(move |ty, _is_struct, _is_union| ty.to_string());
+    cfg.skip_struct(move |ty| match ty {
+        "Elf64_Phdr" | "Elf32_Phdr" => false,
+        _ => true,
     });
-    cfg.skip_type(move |ty| {
-        match ty {
-            "Elf64_Phdr" | "Elf32_Phdr" => false,
-            _ => true,
-        }
+    cfg.skip_type(move |ty| match ty {
+        "Elf64_Phdr" | "Elf32_Phdr" => false,
+        _ => true,
     });
     cfg.header("elf.h");
     cfg.generate("../src/lib.rs", "linux_elf.rs");

diff --git a/src/unix/bsd/netbsdlike/mod.rs b/src/unix/bsd/netbsdlike/mod.rs
@@ -677,8 +677,8 @@ cfg_if! {
         mod netbsd;
         pub use self::netbsd::*;
     } else if #[cfg(target_os = "openbsd")] {
-        mod openbsdlike;
-        pub use self::openbsdlike::*;
+        mod openbsd;
+        pub use self::openbsd::*;
     } else {
         // Unknown target_os
     }

diff --git a/...netbsdlike/openbsdlike/openbsd/aarch64.rs → src/unix/bsd/netbsdlike/openbsd/aarch64.rs b/...netbsdlike/openbsdlike/openbsd/aarch64.rs → src/unix/bsd/netbsdlike/openbsd/aarch64.rs