Merge branch 'main' into thiserror

# Conflicts:
#	src/aztec/decoder.rs
#	src/datamatrix/decoder/decoded_bit_stream_parser.rs

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rxing"
-version = "0.3.1"
+version = "0.3.2"
 description="A rust port of the zxing barcode library."
 license="Apache-2.0"
 repository="https://github.com/rxing-core/rxing"
@@ -13,9 +13,9 @@ exclude = [
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-regex = "1.7.0"
-fancy-regex = "0.10"
-once_cell = "1.17.0"
+regex = "1.7.1"
+fancy-regex = "0.11"
+once_cell = "1.17.1"
 encoding = "0.2"
 urlencoding = "2.1.2"
 uriparse = "0.6.4"
@@ -25,8 +25,7 @@ image = {version = "0.24", optional = true}
 imageproc = {version = "0.23", optional = true}
 unicode-segmentation = "1.10"
 codepage-437 = "0.1.0"
-rxing-one-d-proc-derive = "0.3"
-#rxing-one-d-proc-derive = {path ="../rxing-one-d-proc-derive"}
+rxing-one-d-proc-derive = {version = "0.3", path ="./crates/one-d-proc-derive"}
 num = "0.4.0"
 svg = {version = "0.13", optional = true}
 resvg = {version = "0.28.0", optional = true, default-features=false}
@@ -63,4 +62,10 @@ experimental_features = []
 serde = ["dep:serde"]
 
 #/// Adds otsu binarizer support using imageproc
-otsu_level = ["image"]
+otsu_level = ["image"]
+
+[workspace]
+members = [
+    "crates/one-d-proc-derive",
+    "crates/cli"
+]