Skip to content

Upgrade thiserror to v2 #1

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

Merged
jannschu merged 1 commit into from
Jan 14, 2025
Merged

Upgrade thiserror to v2 #1

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
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ keywords = ["code128", "barcode"]

[features]
default = ["std", "unicode"]
std = ["dep:thiserror"]
std = ["thiserror/std"]
unicode = []

[dependencies]
thiserror = { version = "1.0.40", optional = true }
thiserror = { version = "2.0.0", default-features = false }

[dev-dependencies]
atty = "0.2.14"
25 changes: 10 additions & 15 deletions src/decode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,39 @@ use crate::std::string::String;
use crate::std::vec;
use crate::std::vec::Vec;

#[cfg(feature = "std")]
use thiserror::Error;

use crate::Bar;

/// Errors that can occur during decoding.
#[derive(Debug, PartialEq)]
#[cfg_attr(feature = "std", derive(Error))]
#[derive(Debug, PartialEq, Error)]
pub enum DecodingError {
/// A sequence of modules resulted in an unknown pattern.
#[cfg_attr(feature = "std", error("pattern {0:b} not recognized"))]
#[error("pattern {0:b} not recognized")]
Pattern(u16),
/// A bar's width or spacing is not valid.
#[cfg_attr(feature = "std", error("bar is not valid"))]
#[error("bar is not valid")]
InvalidBar,
/// The stop code at the end is wrong.
#[cfg_attr(feature = "std", error("wrong stop code"))]
#[error("wrong stop code")]
WrongStop,
/// The input was too short.
#[cfg_attr(feature = "std", error("code too short to be valid"))]
#[error("code too short to be valid")]
Short,
/// The code's length can not fit an allowed sequence of modules.
#[cfg_attr(feature = "std", error("length not correct"))]
#[error("length not correct")]
Length,
/// The checksum did not match.
#[cfg_attr(feature = "std", error("checksum mismatch"))]
#[error("checksum mismatch")]
Checksum,
/// The code did not start with a mode signal.
#[cfg_attr(feature = "std", error("start char did not signal mode"))]
#[error("start char did not signal mode")]
NoMode,
/// A symbol occurred in a mode that did not support it or is not implemented.
#[cfg_attr(feature = "std", error("unexpected character {0:x}"))]
#[error("unexpected character {0:x}")]
Unexpected(u8),
/// After decoding the data the conversion from Latin 1 failed.
#[cfg_attr(
feature = "std",
error("characters not covered by Latin 1 were part of this symbol")
)]
#[error("characters not covered by Latin 1 were part of this symbol")]
Latin1,
}

Expand Down
Loading