Merge pull request #868 from pkgw/issue-844

Fix issue 844

Author: pkgw

Cargo.lock

@@ -512,12 +512,9 @@ fn load_math_variants(
         let c = map.get(glyph).unwrap().get_char();
 
         if let Some(vvars) = maybe_vcov
-            .map(|c| c.get(*glyph))
-            .flatten()
-            .map(|i| variants.vert_glyph_construction(i))
-            .flatten()
-            .map(|c| c.variants())
-            .flatten()
+            .and_then(|c| c.get(*glyph))
+            .and_then(|i| variants.vert_glyph_construction(i))
+            .and_then(|c| c.variants())
         {
             for (idx, vinfo) in vvars.iter().enumerate() {
                 map.insert(
@@ -528,12 +525,9 @@ fn load_math_variants(
         }
 
         if let Some(hvars) = maybe_hcov
-            .map(|c| c.get(*glyph))
-            .flatten()
-            .map(|i| variants.horiz_glyph_construction(i))
-            .flatten()
-            .map(|c| c.variants())
-            .flatten()
+            .and_then(|c| c.get(*glyph))
+            .and_then(|i| variants.horiz_glyph_construction(i))
+            .and_then(|c| c.variants())
         {
             for (idx, vinfo) in hvars.iter().enumerate() {
                 map.insert(

crates/engine_spx2html/src/font.rs

@@ -42,8 +42,7 @@ impl GetUrlBackend for ReqwestBackend {
         let parsed = Url::parse(url)?;
         let original_filename = parsed
             .path_segments()
-            .map(|s| s.last())
-            .flatten()
+            .and_then(|s| s.last())
             .unwrap_or(".") // if the filename is this, the `contains('.')` will already match
             .to_owned();
 

crates/geturl/src/reqwest.rs

@@ -149,7 +149,7 @@ pub fn emit_c_header_primitives<W: Write>(pars: &[DimenPar], mut stream: W) -> R
         writeln!(
             stream,
             "    {{ \"{}\", ASSIGN_DIMEN, DIMEN_BASE + DIMEN_PAR__{}, xf_prim_init_none }}, \\",
-            par.name.replace("_", ""),
+            par.name.replace('_', ""),
             par.name.to_lowercase(),
         )?;
     }

crates/xetex_format/src/dimenpars.rs

@@ -117,7 +117,7 @@ impl<T: Copy + std::fmt::Debug> DynamicEnumResolver<T> {
 
             if let Some(v) = item.absval {
                 ensure!(
-                    !values.insert(cur_val, v).is_some(),
+                    values.insert(cur_val, v).is_none(),
                     "duplicated dynamic enum variant value"
                 );
             }

crates/xetex_format/src/enums/dynamic.rs

@@ -77,7 +77,7 @@ pub fn emit_c_header_primitives<W: Write>(pars: &[EtexPenaltiesPar], mut stream:
         writeln!(
             stream,
             "    {{ \"{}\", SET_SHAPE, ETEX_PEN_BASE + ETEX_PENALTIES_PAR__{}, xf_prim_init_none }}, \\",
-            par.name.replace("_", ""),
+            par.name.replace('_', ""),
             par.name.to_lowercase(),
         )?;
     }

crates/xetex_format/src/etexpenalties.rs

@@ -170,7 +170,7 @@ pub fn emit_c_header_primitives<W: Write>(pars: &[GluePar], mut stream: W) -> Re
         writeln!(
             stream,
             "    {{ \"{}\", {}, GLUE_BASE + GLUE_PAR__{}, xf_prim_init_none }}, \\",
-            par.name.replace("_", ""),
+            par.name.replace('_', ""),
             cmd,
             par.name.to_lowercase(),
         )?;

crates/xetex_format/src/gluepars.rs

@@ -505,7 +505,7 @@ pub fn emit_c_header_primitives<W: Write>(pars: &[IntPar], mut stream: W) -> Res
             writeln!(
                 stream,
                 "    {{ \"{}\", ASSIGN_INT, INT_BASE + INT_PAR__{}, xf_prim_init_none }}, \\",
-                prim_name.replace("_", ""),
+                prim_name.replace('_', ""),
                 par.name.to_lowercase(),
             )?;
         }

crates/xetex_format/src/intpars.rs

@@ -166,7 +166,7 @@ pub fn emit_c_header_primitives<W: Write>(pars: &[LocalPar], mut stream: W) -> R
         writeln!(
             stream,
             "    {{ \"{}\", {}, LOCAL_BASE + LOCAL__{}, xf_prim_init_none }}, \\",
-            prim_name.replace("_", ""),
+            prim_name.replace('_', ""),
             cmd,
             par.name.to_lowercase(),
         )?;

crates/xetex_format/src/locals.rs

@@ -338,10 +338,19 @@ impl BridgeState {
                     ));
                 }
 
-                // We could try to be clever and symlink when the input file has
-                // an abspath or something, but ... meh.
                 let mut ih = self.input_open_name(name, status).must_exist()?;
 
+                // If the input path is absolute, we don't need to create a
+                // version in the tempdir, and in fact the current
+                // implementation below will blow away the input file. However,
+                // we do want to try to open the input so that it gets
+                // registered with the I/O tracking system.
+
+                let path = Path::new(name);
+                if path.is_absolute() {
+                    continue;
+                }
+
                 let tool_path = tempdir.path().join(name);
                 let tool_parent = tool_path.parent().unwrap();
 
@@ -1682,7 +1691,7 @@ impl ProcessingSession {
         // PathBuf.file_stem() doesn't do what we want since it only strips
         // one extension. As of 1.17, the compiler needs a type annotation for
         // some reason, which is why we use the `r` variable.
-        let r: Result<&str> = self.format_name.splitn(2, '.').next().ok_or_else(|| {
+        let r: Result<&str> = self.format_name.split('.').next().ok_or_else(|| {
             ErrorKind::Msg(format!(
                 "incomprehensible format file name \"{}\"",
                 self.format_name