Skip to content

Bump all dependencies #1355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CraftSpider wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump all dependencies #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,169 changes: 1,357 additions & 812 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,10 @@ error-chain = "^0.12"
flate2 = { version = "^1.0.19", default-features = false, features = ["zlib"] }
lazy_static = "^1.4"
open = "^5.0"
quick-xml = "0.37"
quick-xml = "0.39"
serde = { version = "^1.0", features = ["derive"], optional = true }
sha2 = "^0.10"
sha2 = "0.11"
digest-io = "0.1"
clap = { version = "4.5.1", features = ["derive"] }
tectonic_bridge_core = { path = "crates/bridge_core", version = "0.0.0-dev.0" }
tectonic_bundles = { path = "crates/bundles", version = "0.0.0-dev.0", default-features = false }
Expand All @@ -100,13 +101,13 @@ tectonic_xetex_layout = { path = "crates/xetex_layout", version = "0.0.0-dev.0"
tempfile = "^3.1"
termcolor = "^1.1"
tokio = "^1.0"
toml = { version = "^0.8", optional = true }
toml = { version = "1.0", optional = true }
watchexec = "8.0"
watchexec-filterer-globset = "8.0"
watchexec-signals = "5.0"
watchexec-supervisor = "5.0"
which = "8.0"
zip = { version = "4.0", default-features = false, features = ["deflate"] }
zip = { version = "8.0", default-features = false, features = ["deflate"] }
clap_complete = "4.5.1"
walkdir = "2"
regex = "1.10.2"
Expand Down
2 changes: 1 addition & 1 deletion crates/bridge_core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ links = "tectonic_bridge_core"
flate2 = { version = "^1.0", default-features = false, features = ["zlib"] }
lazy_static = "^1.4"
libc = "^0.2"
md-5 = "^0.10"
md-5 = "0.11"
tectonic_errors = { path = "../errors", version = "0.0.0-dev.0" }
tectonic_io_base = { path = "../io_base", version = "0.0.0-dev.0" }
tectonic_status_base = { path = "../status_base", version = "0.0.0-dev.0" }
Expand Down
2 changes: 1 addition & 1 deletion crates/bundles/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ tectonic_errors = { path = "../errors", version = "0.0.0-dev.0" }
tectonic_geturl = { path = "../geturl", version = "0.0.0-dev.0", default-features = false }
tectonic_io_base = { path = "../io_base", version = "0.0.0-dev.0" }
tectonic_status_base = { path = "../status_base", version = "0.0.0-dev.0" }
zip = { version = "4", default-features = false, features = ["deflate"] }
zip = { version = "8.0", default-features = false, features = ["deflate"] }
url = "^2.0"

[features]
Expand Down
2 changes: 1 addition & 1 deletion crates/docmodel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ edition = "2021"
[dependencies]
serde = { version = "^1.0", features = ["derive"] }
tectonic_errors = { path = "../errors", version = "0.0.0-dev.0" }
toml = { version = "^0.8" }
toml = { version = "1.0" }

[package.metadata.internal_dep_versions]
tectonic_errors = "5c9ba661edf5ef669f24f9904f99cca369d999e7"
2 changes: 1 addition & 1 deletion crates/geturl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ edition = "2021"
[dependencies]
cfg-if = "^1.0"
curl = { version = "^0.4", optional = true }
reqwest = { version = "^0.12", optional = true, features = ["blocking"] }
reqwest = { version = "0.13", optional = true, features = ["blocking"] }
tectonic_errors = { path = "../errors", version = "0.0.0-dev.0" }
tectonic_status_base = { path = "../status_base", version = "0.0.0-dev.0" }

Expand Down
2 changes: 1 addition & 1 deletion crates/io_base/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ edition = "2021"
app_dirs2 = "^2.3"
flate2 = { version = "^1.0.19", default-features = false, features = ["zlib"] }
libc = "^0.2" # for EISDIR :-(
sha2 = "^0.10" # for digest computations
sha2 = "0.11" # for digest computations
thiserror = "2.0"
tectonic_errors = { path = "../errors", version = "0.0.0-dev.0" }
tectonic_status_base = { path = "../status_base", version = "0.0.0-dev.0" }
Expand Down
4 changes: 3 additions & 1 deletion src/bin/tectonic/v2cli/commands/bundle/select/input/tar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use anyhow::Result;
use digest_io::IoWrapper;
use sha2::{Digest, Sha256};
use std::{
fs::File,
Expand All @@ -24,9 +25,10 @@ impl TarBundleInput {
info!("computing hash of {}", path.to_str().unwrap());

let hash = {
let mut hasher = Sha256::new();
let mut hasher = IoWrapper(Sha256::new());
let _ = std::io::copy(&mut file, &mut hasher)?;
hasher
.0
.finalize()
.iter()
.map(|b| format!("{b:02x}"))
Expand Down
7 changes: 5 additions & 2 deletions src/bin/tectonic/v2cli/commands/bundle/select/picker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use anyhow::{bail, Context, Result};
use digest_io::IoWrapper;
use regex::Regex;
use sha2::{Digest, Sha256};
use std::{
Expand Down Expand Up @@ -208,14 +209,15 @@ impl FilePicker {
hash: match file {
None => None,
Some(f) => {
let mut hasher = Sha256::new();
let mut hasher = IoWrapper(Sha256::new());
let _ = std::io::copy(
&mut fs::File::open(f)
.with_context(|| format!("while computing hash of {path:?}"))?,
&mut hasher,
)?;
Some(
hasher
.0
.finalize()
.iter()
.map(|b| format!("{b:02x}"))
Expand Down Expand Up @@ -541,9 +543,10 @@ impl FilePicker {
let mut file = File::create(self.build_dir.join("content/SHA256SUM"))
.context("while writing SHA256SUM")?;

let mut hasher = Sha256::new();
let mut hasher = IoWrapper(Sha256::new());
let _ = std::io::copy(&mut fs::File::open(&filelist_path)?, &mut hasher)?;
let hash = hasher
.0
.finalize()
.iter()
.map(|b| format!("{b:02x}"))
Expand Down
6 changes: 3 additions & 3 deletions src/driver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2147,7 +2147,7 @@ impl ProcessingSession {
}

(State::InBinaryName, Event::Text(ref e)) => {
let text = e.unescape()?;
let text = e.decode()?;

state = if &text == "biber" {
State::InBiberCmdline
Expand Down Expand Up @@ -2186,7 +2186,7 @@ impl ProcessingSession {
}

(State::InBiberArgument, Event::Text(ref e)) => {
argv.push(e.unescape()?.to_string());
argv.push(e.decode()?.to_string());
state = State::InBiberCmdline;
}

Expand Down Expand Up @@ -2237,7 +2237,7 @@ impl ProcessingSession {
}

(State::InBiberFileRequirement, Event::Text(ref e)) => {
extra_requires.insert(e.unescape()?.to_string());
extra_requires.insert(e.decode()?.to_string());
state = State::InBiberRequirementSection;
}

Expand Down
1 change: 1 addition & 0 deletions src/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ error_chain! {
ConfigWrite(WriteError);
NewStyle(NewError);
QuickXml(quick_xml::Error);
EncodingError(quick_xml::encoding::EncodingError);
Time(std::time::SystemTimeError);
Utf8(str::Utf8Error);
Xdv(tectonic_xdv::XdvError);
Expand Down
Loading