Merge pull request #972 from pkgw/build-fix

CI fixes

Author: pkgw

Cargo.lock

@@ -1,4 +1,4 @@
-// Copyright 2016-2021 the Tectonic Project
+// Copyright 2016-2022 the Tectonic Project
 // Licensed under the MIT License.
 
 #![deny(missing_docs)]
@@ -817,11 +817,7 @@ pub unsafe extern "C" fn ttbc_get_file_md5(
     let rpath = CStr::from_ptr(path).to_string_lossy();
     let rdest = slice::from_raw_parts_mut(digest, 16);
 
-    if es.get_file_md5(rpath.as_ref(), rdest) {
-        1
-    } else {
-        0
-    }
+    libc::c_int::from(es.get_file_md5(rpath.as_ref(), rdest))
 }
 
 /// Calculate the MD5 digest of a block of binary data.
@@ -917,11 +913,7 @@ pub extern "C" fn ttbc_output_flush(
     es: &mut CoreBridgeState,
     handle: *mut OutputHandle,
 ) -> libc::c_int {
-    if es.output_flush(handle) {
-        1
-    } else {
-        0
-    }
+    libc::c_int::from(es.output_flush(handle))
 }
 
 /// Close a Tectonic output file.
@@ -934,11 +926,7 @@ pub extern "C" fn ttbc_output_close(
         return 0; // This is/was the behavior of close_file() in C.
     }
 
-    if es.output_close(handle) {
-        1
-    } else {
-        0
-    }
+    libc::c_int::from(es.output_close(handle))
 }
 
 /// Open a Tectonic file for input.
@@ -1137,11 +1125,7 @@ pub extern "C" fn ttbc_input_close(
         return 0; // This is/was the behavior of close_file() in C.
     }
 
-    if es.input_close(handle) {
-        1
-    } else {
-        0
-    }
+    libc::c_int::from(es.input_close(handle))
 }
 
 /// A buffer for diagnostic messages. Rust code does not need to use this type.
@@ -1214,11 +1198,7 @@ pub unsafe extern "C" fn ttbc_shell_escape(
         }
     };
 
-    if es.shell_escape(&rcmd) {
-        1
-    } else {
-        0
-    }
+    libc::c_int::from(es.shell_escape(&rcmd))
 }
 
 /// Different types of files that can be opened by TeX engines

crates/bridge_core/src/lib.rs

@@ -762,5 +762,5 @@ fn ensure_cache_dir(root: &Path, path: &str) -> Result<PathBuf> {
 
 /// Convenience to generate a text filename
 fn make_txt_path(base: &Path, name: &str) -> PathBuf {
-    base.join(&name).with_extension("txt")
+    base.join(name).with_extension("txt")
 }

crates/bundles/src/cache.rs

@@ -60,7 +60,7 @@ impl Bundle for DirBundle {
         let mut files = Vec::new();
 
         // We intentionally do not explore the directory recursively.
-        for entry in fs::read_dir(&self.0.root())? {
+        for entry in fs::read_dir(self.0.root())? {
             let entry = entry?;
 
             // This catches both regular files and symlinks:`

crates/bundles/src/dir.rs

@@ -118,8 +118,8 @@ impl XdvipdfmxEngine {
 
         let config = c_api::XdvipdfmxConfig {
             paperspec: paperspec_str.as_c_str().as_ptr(),
-            enable_compression: if self.enable_compression { 1 } else { 0 },
-            deterministic_tags: if self.deterministic_tags { 1 } else { 0 },
+            enable_compression: u8::from(self.enable_compression),
+            deterministic_tags: u8::from(self.deterministic_tags),
             build_date: self
                 .build_date
                 .duration_since(SystemTime::UNIX_EPOCH)

crates/engine_xdvipdfmx/src/lib.rs

@@ -164,7 +164,7 @@ fn main() {
 
     let path = matches.value_of_os("PATH").unwrap();
 
-    let file = match File::open(&path) {
+    let file = match File::open(path) {
         Ok(f) => f,
         Err(e) => {
             eprintln!(

crates/xdv/examples/xdvdump.rs

@@ -359,7 +359,7 @@ impl BridgeState {
 
                 if tool_parent != tempdir.path() {
                     ctry!(
-                        std::fs::create_dir_all(&tool_parent);
+                        std::fs::create_dir_all(tool_parent);
                         "failed to create sub directory `{}`", tool_parent.display()
                     );
                 }
@@ -740,7 +740,7 @@ impl DriverHooks for BridgeState {
 
             match Command::new(SHELL[0])
                 .args(&SHELL[1..])
-                .arg(&command)
+                .arg(command)
                 .current_dir(work.root())
                 .status()
             {