Release commit created with Cranko.

+++ cranko-release-info-v1 [[projects]] qnames = ["tectonic_xdv", "cargo"] version = "0.2.2" age = 0 [[projects]] qnames = ["tectonic_errors", "cargo"] version = "0.2.1" age = 0 [[projects]] qnames = ["tectonic_xetex_format", "cargo"] version = "0.3.1" age = 0 [[projects]] qnames = ["tectonic_status_base", "cargo"] version = "0.2.1" age = 0 [[projects]] qnames = ["tectonic_io_base", "cargo"] version = "0.4.2" age = 0 [[projects]] qnames = ["tectonic_geturl", "cargo"] version = "0.3.2" age = 0 [[projects]] qnames = ["tectonic_docmodel", "cargo"] version = "0.2.1" age = 0 [[projects]] qnames = ["tectonic_dep_support", "cargo"] version = "0.1.1" age = 0 [[projects]] qnames = ["tectonic_cfg_support", "cargo"] version = "0.1.4" age = 11 [[projects]] qnames = ["tectonic_bundles", "cargo"] version = "0.3.1" age = 0 [[projects]] qnames = ["tectonic_bridge_icu", "cargo"] version = "0.2.0" age = 32 [[projects]] qnames = ["tectonic_bridge_graphite2", "cargo"] version = "0.2.2" age = 0 [[projects]] qnames = ["tectonic_bridge_harfbuzz", "cargo"] version = "0.2.7" age = 2 [[projects]] qnames = ["tectonic_bridge_freetype2", "cargo"] version = "0.2.0" age = 32 [[projects]] qnames = ["tectonic_bridge_flate", "cargo"] version = "0.1.7" age = 0 [[projects]] qnames = ["tectonic_bridge_core", "cargo"] version = "0.3.2" age = 0 [[projects]] qnames = ["tectonic_xetex_layout", "cargo"] version = "0.2.2" age = 0 [[projects]] qnames = ["tectonic_pdf_io", "cargo"] version = "0.4.1" age = 0 [[projects]] qnames = ["tectonic_engine_xetex", "cargo"] version = "0.4.2" age = 0 [[projects]] qnames = ["tectonic_engine_xdvipdfmx", "cargo"] version = "0.4.1" age = 0 [[projects]] qnames = ["tectonic_engine_spx2html", "cargo"] version = "0.3.0" age = 0 [[projects]] qnames = ["tectonic_engine_bibtex", "cargo"] version = "0.1.5" age = 0 [[projects]] qnames = ["tectonic", "cargo"] version = "0.12.0" age = 1 +++
tectonic-typesetting · May 18, 2023 · 788a654 · 788a654
2 parents 4dd8c21 + 09d8637
commit 788a654
Show file tree

Hide file tree

Showing 116 changed files with 6,198 additions and 3,984 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -63,17 +63,17 @@ flate2 = { version = "^1.0.19", default-features = false, features = ["zlib"] }
 fs2 = "^0.4"
 lazy_static = "^1.4"
 libc = "^0.2"
-md-5 = "^0.9"
-open = "1.4.0"
-quick-xml = "^0.22"
+md-5 = "^0.10"
+open = "^4.0"
+quick-xml = "^0.28"
 serde = { version = "^1.0", features = ["derive"], optional = true }
-sha2 = "^0.9"
+sha2 = "^0.10"
 structopt = "0.3"
 tectonic_bridge_core = { path = "crates/bridge_core", version =">=0.3.0,<1"}
 tectonic_bundles = { path = "crates/bundles", version =">=0.3.0,<1", default-features = false }
 tectonic_docmodel = { path = "crates/docmodel", version =">=0.2.0,<1", optional = true }
 tectonic_engine_bibtex = { path = "crates/engine_bibtex", version =">=0.1.0,<1"}
-tectonic_engine_spx2html = { path = "crates/engine_spx2html", version =">=0.1.1,<1"}
+tectonic_engine_spx2html = { path = "crates/engine_spx2html", version =">=0.3.0,<1"}
 tectonic_engine_xdvipdfmx = { path = "crates/engine_xdvipdfmx", version =">=0.3.0,<1"}
 tectonic_engine_xetex = { path = "crates/engine_xetex", version =">=0.4.0,<1"}
 tectonic_errors = { path = "crates/errors", version =">=0.1.0,<1"}
@@ -84,10 +84,13 @@ tectonic_xdv = { path = "crates/xdv", version =">=0.1.9,<1"}
 tectonic_xetex_layout = { path = "crates/xetex_layout", version =">=0.1.0,<1"}
 tempfile = "^3.1"
 termcolor = "^1.1"
-toml = { version = "^0.5", optional = true }
+tokio = "^1.0"
+toml = { version = "^0.7", optional = true }
 url = "^2.0"
-watchexec = "^1.15.3"
-zip = { version = "^0.5", default-features = false, features = ["deflate"] }
+watchexec = "^2.3.0"
+watchexec-filterer-globset = "1.2"
+watchexec-signals = "1.0"
+zip = { version = "^0.6", default-features = false, features = ["deflate"] }
 
 [features]
 default = ["geturl-reqwest", "serialization"]
@@ -112,21 +115,24 @@ profile = []
 
 [dev-dependencies]
 filetime = "^0.2"
-futures = "0.1"
-headers = "0.2"
-hyper = "0.12"
+futures = "0.3"
+headers = "0.3"
+hyper = { version = "0.14", features = ["server"] }
 tempfile = "^3.1"
-tokio = "0.1.22"
 
 [package.metadata.vcpkg]
 git = "https://github.com/microsoft/vcpkg"
-rev = "1be5a98d090b1d2beeb63a48ba800fbf006e8aca"
+rev = "ea222747b888b8d63df56240b262db38b095c68f"
+overlay-triplets-path = "dist/vcpkg-triplets"
 
+# If other targets start using custom triplets like x86_64-pc-windows-msvc,
+# add them to crates/dep_support/src/lib.rs:new_from_vcpkg() to give users
+# guidance if they might need to set $VCPKGRS_TRIPLET.
 [package.metadata.vcpkg.target]
 x86_64-apple-darwin = { install = ["freetype","harfbuzz[icu,graphite2]"] }
 aarch64-apple-darwin = { triplet = "arm64-osx", install = ["freetype","harfbuzz[icu,graphite2]"] }
 x86_64-unknown-linux-gnu = { install = ["fontconfig","freetype","harfbuzz[icu,graphite2]"] }
-x86_64-pc-windows-msvc = { triplet = "x64-windows-static", install = ["fontconfig","freetype","harfbuzz[icu,graphite2]"] }
+x86_64-pc-windows-msvc = { triplet = "x64-windows-static-release", install = ["fontconfig","freetype","harfbuzz[icu,graphite2]"] }
 
 [package.metadata.internal_dep_versions]
 tectonic_bridge_core = "526ff57d5dd9f80dff35a3a5dd856edc9f0f61aa"
@@ -139,7 +145,7 @@ tectonic_cfg_support = "thiscommit:aeRoo7oa"
 tectonic_dep_support = "5faf4205bdd3d31101b749fc32857dd746f9e5bc"
 tectonic_docmodel = "a88a0418a9c3c559d023d9b1da9b03fce3a469e5"
 tectonic_engine_bibtex = "thiscommit:2021-01-17:KuhaeG1e"
-tectonic_engine_spx2html = "thiscommit:2022-03-02:IQWAncv"
+tectonic_engine_spx2html = "thiscommit:2022-11-22:vicemXu"
 tectonic_engine_xdvipdfmx = "8a003834b1f6d967d33cc07de4cc025af14560da"
 tectonic_engine_xetex = "c135e6a4a5a2e8c2dc4edcbcfd93f7d466ff8f88"
 tectonic_errors = "317ae79ceaa2593fb56090e37bf1f5cc24213dd9"

diff --git a/build.rs b/build.rs
@@ -9,5 +9,5 @@ fn main() {
     // they want to spawn off executables.
 
     let target = env::var("TARGET").unwrap();
-    println!("cargo:rustc-env=TARGET={}", target);
+    println!("cargo:rustc-env=TARGET={target}");
 }
diff --git a/crates/bridge_core/CHANGELOG.md b/crates/bridge_core/CHANGELOG.md
@@ -1,3 +1,9 @@
+# tectonic_bridge_core 0.3.2 (2023-05-18)
+
+- Bump the `md-5` dep to the 0.10 series (#1038, @CraftSpider)
+- Tidy up recent Clippy warnings.
+
+
 # tectonic_bridge_core 0.3.1 (2022-10-03)
 
 - Remove C's `time_t` from internal FFI APIs to avoid portability issues. This

diff --git a/crates/bridge_core/Cargo.toml b/crates/bridge_core/Cargo.toml
@@ -5,7 +5,7 @@
 
 [package]
 name = "tectonic_bridge_core"
-version = "0.3.1"
+version = "0.3.2"
 authors = ["Peter Williams <[email protected]>"]
 description = """
 Exposing core backend APIs to the Tectonic C/C++ code.
@@ -22,7 +22,7 @@ links = "tectonic_bridge_core"
 flate2 = { version = "^1.0", default-features = false, features = ["zlib"] }
 lazy_static = "^1.4"
 libc = "^0.2"
-md-5 = "^0.9"
+md-5 = "^0.10"
 tectonic_errors = { path = "../errors", version =">=0.2.0,<1"}
 tectonic_io_base = { path = "../io_base", version =">=0.3.0,<1"}
 tectonic_status_base = { path = "../status_base", version =">=0.1.0,<1"}

diff --git a/crates/bridge_core/src/lib.rs b/crates/bridge_core/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2016-2021 the Tectonic Project
+// Copyright 2016-2022 the Tectonic Project
 // Licensed under the MIT License.
 
 #![deny(missing_docs)]
@@ -349,7 +349,7 @@ impl<'a> CoreBridgeState<'a> {
         // `lipsum.ltd.tex` under the name `lipsum.ltd`.
 
         for e in format.extensions() {
-            let ext = format!("{}.{}", name, e);
+            let ext = format!("{name}.{e}");
 
             if let FileFormat::Format = format {
                 match io.input_open_format(&ext, self.status) {
@@ -714,11 +714,12 @@ pub struct SecuritySettings {
 
 /// Different high-level security stances that can be adopted when creating
 /// [`SecuritySettings`].
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 pub enum SecurityStance {
     /// Ensure that all known-insecure features are disabled.
     ///
     /// Use this stance if you are processing untrusted input.
+    #[default]
     DisableInsecures,
 
     /// Request to allow the use of known-insecure features.
@@ -730,13 +731,6 @@ pub enum SecurityStance {
     MaybeAllowInsecures,
 }
 
-impl Default for SecurityStance {
-    fn default() -> Self {
-        // Obvi, the default is secure!!!
-        SecurityStance::DisableInsecures
-    }
-}
-
 impl SecuritySettings {
     /// Create a new security configuration.
     ///
@@ -817,11 +811,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 +907,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 +920,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 +1119,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 +1192,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

diff --git a/crates/bridge_flate/CHANGELOG.md b/crates/bridge_flate/CHANGELOG.md
@@ -1,3 +1,8 @@
+# tectonic_bridge_flate 0.1.7 (2023-05-18)
+
+- Tidy up recent Clippy warnings.
+
+
 # tectonic_bridge_flate 0.1.6 (2022-10-03)
 
 No code changes, but some internal documentation improvements about managing FFI

diff --git a/crates/bridge_flate/Cargo.toml b/crates/bridge_flate/Cargo.toml
@@ -5,7 +5,7 @@
 
 [package]
 name = "tectonic_bridge_flate"
-version = "0.1.6"
+version = "0.1.7"
 authors = ["Peter Williams <[email protected]>"]
 description = """
 Exposing flate compression to the Tectonic C code.

diff --git a/crates/bridge_flate/src/lib.rs b/crates/bridge_flate/src/lib.rs
@@ -72,7 +72,7 @@ pub unsafe extern "C" fn tectonic_flate_compress(
         (c.total_out(), FlateResult::Success)
     };
 
-    *output_len = size as u64;
+    *output_len = size;
     result
 }
 
@@ -101,7 +101,7 @@ pub unsafe extern "C" fn tectonic_flate_decompress(
         Err(_) => (0, FlateResult::OtherError),
     };
 
-    *output_len = size as u64;
+    *output_len = size;
     result
 }
 

diff --git a/crates/bridge_graphite2/CHANGELOG.md b/crates/bridge_graphite2/CHANGELOG.md
@@ -1,3 +1,8 @@
+# tectonic_bridge_graphite2 0.2.2 (2023-05-18)
+
+- Tidy up recent Clippy warnings.
+
+
 # tectonic_bridge_graphite2 0.2.1 (2021-10-11)
 
 - Fix the build script for Rust >=1.55 (#820, @pkgw)

diff --git a/crates/bridge_graphite2/Cargo.toml b/crates/bridge_graphite2/Cargo.toml
@@ -5,7 +5,7 @@
 
 [package]
 name = "tectonic_bridge_graphite2"
-version = "0.2.1"
+version = "0.2.2"
 authors = ["Peter Williams <[email protected]>"]
 description = """
 Expose the graphite2 library to Rust/Cargo.

diff --git a/crates/bridge_graphite2/build.rs b/crates/bridge_graphite2/build.rs
@@ -55,5 +55,5 @@ fn main() {
         ""
     };
 
-    println!("cargo:define_static={}", define_static_flag);
+    println!("cargo:define_static={define_static_flag}");
 }
diff --git a/crates/bundles/CHANGELOG.md b/crates/bundles/CHANGELOG.md
@@ -1,3 +1,9 @@
+# tectonic_bundles 0.3.1 (2023-05-18)
+
+- Bump the `zip` dependency to the 0.6 series (#1038, @CraftSpider)
+- Tidy up formatting and recent Clippy warnings
+
+
 # tectonic_bundles 0.3.0 (2022-04-26)
 
 This minor bump contains a breaking change!

diff --git a/crates/bundles/Cargo.toml b/crates/bundles/Cargo.toml
@@ -5,7 +5,7 @@
 
 [package]
 name = "tectonic_bundles"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Peter Williams <[email protected]>"]
 description = """
 Tectonic "bundle" (support file collection) implementations.
@@ -24,7 +24,7 @@ tectonic_errors = { path = "../errors", version =">=0.2.0,<1"}
 tectonic_geturl = { path = "../geturl", version =">=0.3.0,<1", default-features = false }
 tectonic_io_base = { path = "../io_base", version =">=0.3.0,<1"}
 tectonic_status_base = { path = "../status_base", version =">=0.1.0,<1"}
-zip = { version = "^0.5", default-features = false, features = ["deflate"] }
+zip = { version = "^0.6", default-features = false, features = ["deflate"] }
 
 [features]
 default = ["geturl-reqwest"]

diff --git a/crates/bundles/src/cache.rs b/crates/bundles/src/cache.rs
@@ -461,7 +461,7 @@ impl<CB: CacheBackend> CachingBundle<CB> {
         // line-based manifest format. Be paranoid and refuse to record such
         // filenames.
         if !name.contains(|c| c == '\n' || c == '\r') {
-            writeln!(man, "{} {} {}", name, length, digest_text)?;
+            writeln!(man, "{name} {length} {digest_text}")?;
         }
 
         self.contents.insert(
@@ -525,7 +525,7 @@ impl<CB: CacheBackend> CachingBundle<CB> {
             // The resolved URL has changed, but the digest is the same. So
             // let's just update the URL and keep going.
             let resolved_path = make_txt_path(&self.resolved_base, &pull_data.digest.to_string());
-            file_create_write(&resolved_path, |f| {
+            file_create_write(resolved_path, |f| {
                 f.write_all(pull_data.resolved_url.as_bytes())
             })?;
 
@@ -647,7 +647,7 @@ impl<CB: CacheBackend> IoProvider for CachingBundle<CB> {
             OpenResult::Err(e) => return OpenResult::Err(e),
         };
 
-        let f = match File::open(&path) {
+        let f = match File::open(path) {
             Ok(f) => f,
             Err(e) => return OpenResult::Err(e.into()),
         };
@@ -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")
 }
diff --git a/crates/bundles/src/dir.rs b/crates/bundles/src/dir.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:`

diff --git a/crates/bundles/src/lib.rs b/crates/bundles/src/lib.rs
@@ -117,10 +117,7 @@ pub fn get_fallback_bundle_url(format_version: u32) -> String {
     if format_version < 32 {
         "https://relay.fullyjustified.net/default_bundle.tar".to_owned()
     } else {
-        format!(
-            "https://relay.fullyjustified.net/default_bundle_v{}.tar",
-            format_version
-        )
+        format!("https://relay.fullyjustified.net/default_bundle_v{format_version}.tar")
     }
 }
 

diff --git a/crates/dep_support/CHANGELOG.md b/crates/dep_support/CHANGELOG.md
@@ -1,3 +1,11 @@
+# tectonic_dep_support 0.1.1 (2023-05-18)
+
+- Default the Windows vcpkg build to use a custom triplet that doesn't
+  do debug builds (#961, @pkgw). This significantly speeds up the
+  Tectonic Windows CI runs.
+- Tidy up recent Clippy warnings.
+
+
 # tectonic_dep_support 0.1.0 (2021-01-04)
 
 A new crate to support Tectonic's searching for external libraries

diff --git a/crates/dep_support/Cargo.toml b/crates/dep_support/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "tectonic_dep_support"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Peter Williams <[email protected]>"]
 description = """
 Support for finding third-party libraries using either pkg-config or vcpkg.
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,5 +55,5 @@ fn main() { @@
             ""
         };
-        println!("cargo:define_static={}", define_static_flag);
+        println!("cargo:define_static={define_static_flag}");
     }