From 00f794311bbdb2864e381790abe97b8e4dcdfad5 Mon Sep 17 00:00:00 2001 From: Abdulla Abdurakhmanov Date: Sun, 22 Dec 2024 12:28:59 +0100 Subject: [PATCH] chore: Ver up --- Cargo.lock | 102 ++++++++++++++++++------------- Cargo.toml | 2 +- src/file_converters/ocr_ocrs.rs | 2 +- src/redacters/stream_redacter.rs | 2 +- 4 files changed, 64 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2954b0d..c35f9b6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -172,7 +172,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -202,7 +202,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -224,7 +224,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -235,7 +235,7 @@ checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -975,7 +975,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -1238,7 +1238,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -1249,7 +1249,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -1286,7 +1286,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -1329,7 +1329,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -1492,7 +1492,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -1566,7 +1566,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -1601,9 +1601,9 @@ dependencies = [ [[package]] name = "gcloud-sdk" -version = "0.25.6" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d92f38cbe5b8796d2ab3f3c5f3bc286aa778015d5c5f67e2d0cbbe5d348473f" +checksum = "1a74ef7c29e682f146bac39c68921e2516e1f99f90742c8de56cb073990ef19f" dependencies = [ "async-trait", "bytes", @@ -2112,7 +2112,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -2447,7 +2447,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -2614,7 +2614,7 @@ dependencies = [ "rten", "rten-imageproc", "rten-tensor", - "thiserror", + "thiserror 1.0.63", "wasm-bindgen", ] @@ -2777,7 +2777,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -2850,9 +2850,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -2873,7 +2873,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -2896,7 +2896,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -2936,7 +2936,7 @@ dependencies = [ "rustc-hash", "rustls 0.23.12", "socket2", - "thiserror", + "thiserror 1.0.63", "tokio", "tracing", ] @@ -2953,7 +2953,7 @@ dependencies = [ "rustc-hash", "rustls 0.23.12", "slab", - "thiserror", + "thiserror 1.0.63", "tinyvec", "tracing", ] @@ -3040,7 +3040,7 @@ dependencies = [ "rand_chacha", "simd_helpers", "system-deps", - "thiserror", + "thiserror 1.0.63", "v_frame", "wasm-bindgen", ] @@ -3081,7 +3081,7 @@ dependencies = [ [[package]] name = "redacter" -version = "0.11.1" +version = "0.12.0" dependencies = [ "anyhow", "arboard", @@ -3119,7 +3119,7 @@ dependencies = [ "sha2", "sync_wrapper 1.0.1", "tempfile", - "thiserror", + "thiserror 2.0.9", "tokio", "tokio-util", "tracing", @@ -3145,7 +3145,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -3604,7 +3604,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -3667,7 +3667,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -3749,7 +3749,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", "num-traits", - "thiserror", + "thiserror 1.0.63", "time", ] @@ -3822,9 +3822,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "d53cbcb5a243bd33b7858b1d7f4aca2153490815872d86d955d6ea29f743c035" dependencies = [ "proc-macro2", "quote", @@ -3884,7 +3884,16 @@ version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.63", +] + +[[package]] +name = "thiserror" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +dependencies = [ + "thiserror-impl 2.0.9", ] [[package]] @@ -3895,7 +3904,18 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.91", ] [[package]] @@ -3990,7 +4010,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -4179,7 +4199,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -4394,7 +4414,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", "wasm-bindgen-shared", ] @@ -4428,7 +4448,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4736,7 +4756,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -4756,7 +4776,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.91", ] [[package]] @@ -4781,7 +4801,7 @@ dependencies = [ "pbkdf2", "rand", "sha1", - "thiserror", + "thiserror 1.0.63", "time", "zeroize", "zopfli", diff --git a/Cargo.toml b/Cargo.toml index c05b2de..d5f359e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "redacter" -version = "0.11.1" +version = "0.12.0" edition = "2021" authors = ["Abdulla Abdurakhmanov "] license = "Apache-2.0" diff --git a/src/file_converters/ocr_ocrs.rs b/src/file_converters/ocr_ocrs.rs index f40dab4..9b946e4 100644 --- a/src/file_converters/ocr_ocrs.rs +++ b/src/file_converters/ocr_ocrs.rs @@ -57,7 +57,7 @@ impl<'a> Ocrs<'a> { } } -impl<'a> Ocr for Ocrs<'a> { +impl Ocr for Ocrs<'_> { fn image_to_text(&self, image: image::DynamicImage) -> AppResult> { let rgb_image = image.to_rgb8(); let image_source = ImageSource::from_bytes(rgb_image.as_raw(), rgb_image.dimensions())?; diff --git a/src/redacters/stream_redacter.rs b/src/redacters/stream_redacter.rs index 6e812dc..b874119 100644 --- a/src/redacters/stream_redacter.rs +++ b/src/redacters/stream_redacter.rs @@ -48,7 +48,7 @@ impl<'a> StreamRedacter<'a> { &'a self, redacters: &'a Vec>, file_ref: &FileSystemRef, - ) -> AppResult { + ) -> AppResult> { let mut stream_redact_plan = StreamRedactPlan { apply_pdf_image_converter: false, apply_ocr: false,