resolve Cargo.lock differences

.gitignore

@@ -2,6 +2,7 @@
 /tests/plain.fmt
 /tests/00*00-latex-*.fmt
 /tests/00*00-plain-*.fmt
+/tests/xenia/paper.pdf
 
 # ignore mdbook compiled output (HTML)
 docs/book/*

Cargo.toml

@@ -35,7 +35,7 @@ crate-type = ["rlib"]
 [build-dependencies]
 cc = "^1.0"
 pkg-config = "^0.3"  # note: sync dist/docker/*/pkg-config-rs.sh with the version in Cargo.lock
-regex = "^1.1"
+regex = "^1.3"
 sha2 = "^0.8"
 vcpkg = "0.2.7"
 

src/io/cached_itarbundle.rs

@@ -680,7 +680,7 @@ impl IoProvider for CachedITarBundle {
             Err(e) => return OpenResult::Err(e.into()),
         };
 
-        OpenResult::Ok(InputHandle::new(
+        OpenResult::Ok(InputHandle::new_read_only(
             name,
             BufReader::new(f),
             InputOrigin::Other,

src/io/format_cache.rs

@@ -84,7 +84,7 @@ impl IoProvider for FormatCache {
             OpenResult::Err(e) => return OpenResult::Err(e),
         };
 
-        OpenResult::Ok(InputHandle::new(
+        OpenResult::Ok(InputHandle::new_read_only(
             name,
             BufReader::new(f),
             InputOrigin::Other,

src/io/mod.rs

@@ -71,10 +71,12 @@ pub enum InputOrigin {
 /// computation. The `ExecutionState` code then has further pieces that track
 /// access to nonexistent files, which we treat as being equivalent to an
 /// existing empty file for these purposes.
-
 pub struct InputHandle {
     name: OsString,
     inner: Box<dyn InputFeatures>,
+    /// Indicates that the file cannot be written to (provided by a read-only IoProvider) and
+    /// therefore it is useless to compute the digest.
+    read_only: bool,
     digest: digest::DigestComputer,
     origin: InputOrigin,
     ever_read: bool,
@@ -91,6 +93,24 @@ impl InputHandle {
         InputHandle {
             name: name.to_os_string(),
             inner: Box::new(inner),
+            read_only: false,
+            digest: Default::default(),
+            origin,
+            ever_read: false,
+            did_unhandled_seek: false,
+            ungetc_char: None,
+        }
+    }
+
+    pub fn new_read_only<T: 'static + InputFeatures>(
+        name: &OsStr,
+        inner: T,
+        origin: InputOrigin,
+    ) -> InputHandle {
+        InputHandle {
+            name: name.to_os_string(),
+            inner: Box::new(inner),
+            read_only: true,
             digest: Default::default(),
             origin,
             ever_read: false,
@@ -114,13 +134,13 @@ impl InputHandle {
     }
 
     /// Consumes the object and returns the SHA256 sum of the content that was
-    /// written. No digest is returned if there was ever a seek on the input
+    /// read. No digest is returned if there was ever a seek on the input
     /// stream, since in that case the results will not be reliable. We also
     /// return None if the stream was never read, which is another common
     /// TeX access pattern: files are opened, immediately closed, and then
-    /// opened again.
+    /// opened again. Finally, no digest is returned if the file is marked read-only.
     pub fn into_name_digest(self) -> (OsString, Option<DigestData>) {
-        if self.did_unhandled_seek || !self.ever_read {
+        if self.did_unhandled_seek || !self.ever_read || self.read_only {
             (self.name, None)
         } else {
             (self.name, Some(DigestData::from(self.digest)))
@@ -174,7 +194,9 @@ impl Read for InputHandle {
 
         self.ever_read = true;
         let n = self.inner.read(buf)?;
-        self.digest.input(&buf[..n]);
+        if !self.read_only {
+            self.digest.input(&buf[..n]);
+        }
         Ok(n)
     }
 }

src/io/zipbundle.rs

@@ -66,7 +66,11 @@ impl<R: Read + Seek> IoProvider for ZipBundle<R> {
             return OpenResult::Err(e.into());
         }
 
-        OpenResult::Ok(InputHandle::new(name, Cursor::new(buf), InputOrigin::Other))
+        OpenResult::Ok(InputHandle::new_read_only(
+            name,
+            Cursor::new(buf),
+            InputOrigin::Other,
+        ))
     }
 }