3

Author: nyurik

libc-test/build.rs

@@ -129,21 +129,21 @@ fn process_semver_file<W: Write, P: AsRef<Path>>(output: &mut W, path: &mut Path
     };
     let input = BufReader::new(input_file);
 
-    write!(output, "// Source: {}.\n", path.display()).unwrap();
-    output.write(b"use libc::{\n").unwrap();
+    writeln!(output, "// Source: {}.", path.display()).unwrap();
+    output.write_all(b"use libc::{\n").unwrap();
     for line in input.lines() {
         let line = line.unwrap().into_bytes();
         match line.first() {
             // Ignore comments and empty lines.
             Some(b'#') | None => continue,
             _ => {
-                output.write(b"    ").unwrap();
-                output.write(&line).unwrap();
-                output.write(b",\n").unwrap();
+                output.write_all(b"    ").unwrap();
+                output.write_all(&line).unwrap();
+                output.write_all(b",\n").unwrap();
             }
         }
     }
-    output.write(b"};\n\n").unwrap();
+    output.write_all(b"};\n\n").unwrap();
     path.pop();
 }
 
@@ -158,21 +158,21 @@ fn main() {
 
     // FIXME(ctest): ctest cannot parse `crate::` in paths, so replace them with `::`
     let re = regex::bytes::Regex::new(r"(?-u:\b)crate::").unwrap();
-    copy_dir_hotfix(Path::new("../src"), &hotfix_dir, &re);
+    copy_dir_hotfix(Path::new("../src"), &hotfix_dir, &re, b"::");
 
     do_cc();
     do_ctest();
     do_semver();
 }
 
-fn copy_dir_hotfix(src: &Path, dst: &Path, regex: &regex::bytes::Regex) {
-    std::fs::create_dir(dst).unwrap();
+fn copy_dir_hotfix(src: &Path, dst: &Path, regex: &regex::bytes::Regex, replace: &[u8]) {
+    std::fs::create_dir(&dst).unwrap();
     for entry in src.read_dir().unwrap() {
         let entry = entry.unwrap();
         let src_path = entry.path();
         let dst_path = dst.join(entry.file_name());
         if entry.file_type().unwrap().is_dir() {
-            copy_dir_hotfix(&src_path, &dst_path, regex);
+            copy_dir_hotfix(&src_path, &dst_path, regex, replace);
         } else {
             // Replace "crate::" with "::"
             let src_data = std::fs::read(&src_path).unwrap();