Skip to content

Commit 211c96f

Browse files
committed
chore: upgrade ron
1 parent 03afa27 commit 211c96f

File tree

9 files changed

+55
-31
lines changed

9 files changed

+55
-31
lines changed

Cargo.lock

Lines changed: 40 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ log = "0.4"
1414
env_logger = { version = "0.8.4", default-features = false }
1515
pretty_env_logger = "0.5"
1616
bitflags = "2.8"
17-
thiserror = "1.0"
17+
thiserror.workspace = true
1818
nom-supreme = "0.8"
1919
ccitt-t4-t6 = { path = "crates/ccitt" }
2020
pdf-create = { path = "crates/pdf" }
2121
sdo-pdf = { path = "crates/sdo-pdf" }
2222
sdo-ps = { path = "crates/sdo-ps" }
2323
sdo-util = { path = "crates/sdo-util" }
2424
signum = { path = "crates/signum", features = ["image"] }
25-
ron = "0.6"
25+
ron.workspace = true
2626
serde = "1.0"
2727
futures-lite = "2.3.0"
2828

@@ -32,13 +32,15 @@ version = "0.25"
3232
features = ["png"]
3333

3434
[dev-dependencies]
35-
pdf = { workspace = true }
35+
pdf.workspace = true
3636

3737
[workspace]
3838
members = ["crates/*"]
3939

4040
[workspace.dependencies]
4141
pdf = "0.9"
42+
ron = "0.12"
43+
thiserror = "2"
4244
tiff = "0.11"
4345

4446
[patch.crates-io.fontdue]

crates/ccitt/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ homepage = "https://xiphoseer.github.io/sdo-tool/implementation#ccitt-t4-t6"
1313
debug = []
1414

1515
[dependencies]
16-
thiserror = "1"
16+
thiserror.workspace = true
1717

1818
[dev-dependencies]
1919
argh = "0.1.13"
2020
color-eyre = { version = "0.5", default-features = false }
21-
tiff = { workspace = true }
21+
tiff.workspace = true

crates/pcf/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description = "Implementation of the Pre-Compiled-Font format (PCF / X11)"
77

88
[dependencies]
99
nom = "7"
10-
thiserror = "1.0"
10+
thiserror = { workspace = true }
1111
bitflags = "2.8"
1212

1313
[dev-dependencies]

crates/pdf/src/common.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ use std::{
88
str::FromStr,
99
};
1010

11-
//use pdf::primitive::PdfString;
12-
1311
use crate::{
1412
encoding::{pdf_doc_encode, PDFDocEncodingError},
1513
write::{Formatter, PdfName, PdfNameBuf, Serialize, ToDict},

crates/signum/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ default = ["chrono"]
1414

1515
[dependencies]
1616
nom = "7"
17-
thiserror = "1.0"
17+
thiserror = { workspace = true }
1818
bitflags = { version = "2.8", features = ["serde"] }
1919
displaydoc = "0.2"
2020
log = "0.4"

crates/texfonts/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2018"
66

77
[dependencies]
88
nom = "7"
9-
thiserror = "1.0"
9+
thiserror = { workspace = true }
1010
bitflags = "2.8"
1111

1212
[dev-dependencies]

src/bin/sdo-toc.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,14 @@ pub fn run(buffer: &[u8], opt: RunOpts) -> eyre::Result<()> {
118118
}
119119
}
120120

121-
let cfg = PrettyConfig::new().with_separate_tuple_members(false);
121+
let cfg = PrettyConfig::new().separate_tuple_members(false);
122+
let ron = ron::Options::default();
122123
if opt.out.as_os_str() == OsStr::new("-") {
123-
ron::ser::to_writer_pretty(std::io::stdout(), &outline, cfg)?;
124+
ron.to_io_writer_pretty(std::io::stdout(), &outline, cfg)?;
124125
} else {
125126
let file = std::fs::File::create_new(&opt.out)?;
126127
let writer = BufWriter::new(file);
127-
ron::ser::to_writer_pretty(writer, &outline, cfg)?;
128+
ron.to_io_writer_pretty(writer, &outline, cfg)?;
128129
log::info!("Wrote '{}'", opt.out.display());
129130
}
130131

src/cli/opt/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ pub enum MetaError {
132132
#[error("IO Error")]
133133
Io(#[from] io::Error),
134134
#[error("Deserialize Error")]
135-
Ron(#[from] ron::error::Error),
135+
Ron(#[from] ron::error::SpannedError),
136136
}
137137

138138
impl Options {

0 commit comments

Comments
 (0)