chore: bump msrv and fix clippy warnings

Author: Rexagon

Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Ivan Kalinin <i.kalinin@dexpa.io>"]
 repository = "https://github.com/broxus/tycho-types"
 version = "0.2.1"
 edition = "2024"
-rust-version = "1.85"
+rust-version = "1.88"
 include = ["src/**/*.rs", "benches/**/*.rs", "LICENSE-*", "README.md"]
 license = "MIT OR Apache-2.0"
 

README.md

@@ -4,8 +4,8 @@
 [crates-io-link]: https://crates.io/crates/tycho-types
 [docs-badge]: https://docs.rs/tycho-types/badge.svg
 [docs-url]: https://docs.rs/tycho-types
-[rust-version-badge]: https://img.shields.io/badge/rustc-1.85+-lightgray.svg
-[rust-version-link]: https://blog.rust-lang.org/2025/02/20/Rust-1.85.0/
+[rust-version-badge]: https://img.shields.io/badge/rustc-1.88+-lightgray.svg
+[rust-version-link]: https://blog.rust-lang.org/2025/06/26/Rust-1.88.0/
 [workflow-badge]: https://img.shields.io/github/actions/workflow/status/broxus/tycho-types/master.yml?branch=master
 [workflow-link]: https://github.com/broxus/tycho-types/actions?query=workflow%3Amaster
 

abi-proc/src/internals/container.rs

@@ -46,23 +46,23 @@ pub fn with_bound(fields: &Fields, generics: &syn::Generics, bound: &syn::Path)
 
     impl<'ast> Visit<'ast> for FindTyParams<'ast> {
         fn visit_field(&mut self, field: &'ast syn::Field) {
-            if let syn::Type::Path(ty) = ungroup(&field.ty) {
-                if let Some(Pair::Punctuated(t, _)) = ty.path.segments.pairs().next() {
-                    if self.all_type_params.contains(&t.ident) {
-                        self.associated_type_usage.push(ty);
-                    }
-                }
+            if let syn::Type::Path(ty) = ungroup(&field.ty)
+                && let Some(Pair::Punctuated(t, _)) = ty.path.segments.pairs().next()
+                && self.all_type_params.contains(&t.ident)
+            {
+                self.associated_type_usage.push(ty);
             }
+
             self.visit_type(&field.ty);
         }
 
         fn visit_macro(&mut self, _mac: &'ast syn::Macro) {}
 
         fn visit_path(&mut self, path: &'ast syn::Path) {
-            if let Some(seg) = path.segments.last() {
-                if seg.ident == "PhantomData" {
-                    return;
-                }
+            if let Some(seg) = path.segments.last()
+                && seg.ident == "PhantomData"
+            {
+                return;
             }
             if path.leading_colon.is_none() && path.segments.len() == 1 {
                 let id = &path.segments[0].ident;

abi-proc/src/internals/field.rs

@@ -41,26 +41,25 @@ pub struct FieldAttributes {
 
 impl FieldAttributes {
     pub fn check(&self) -> Result<(), Error> {
-        if let Some(path) = &self.mod_handler {
-            if self.with_handlers.into_abi_handler.is_some()
-                && self.with_handlers.from_abi_handler.is_some()
-                && self.with_handlers.as_abi_handler.is_some()
-                && self.with_handlers.abi_type_handler.is_some()
-            {
-                return Err(Error::new_spanned(
-                    path,
-                    "`with` parameter should not be used simultaneously with other handling parameters",
-                ));
-            }
+        if let Some(path) = &self.mod_handler
+            && self.with_handlers.into_abi_handler.is_some()
+            && self.with_handlers.from_abi_handler.is_some()
+            && self.with_handlers.as_abi_handler.is_some()
+            && self.with_handlers.abi_type_handler.is_some()
+        {
+            return Err(Error::new_spanned(
+                path,
+                "all `with` module methods are shadowed by explicit attributes",
+            ));
         }
 
-        if let Some(path) = &self.with_handlers.into_abi_handler {
-            if self.with_handlers.as_abi_handler.is_none() {
-                return Err(Error::new_spanned(
-                    path,
-                    "`into_abi_with` also requires `as_abi_with`",
-                ));
-            }
+        if let Some(path) = &self.with_handlers.into_abi_handler
+            && self.with_handlers.as_abi_handler.is_none()
+        {
+            return Err(Error::new_spanned(
+                path,
+                "`into_abi_with` also requires `as_abi_with`",
+            ));
         }
 
         Ok(())

fuzz/fuzz_targets/base64_addr.rs

@@ -3,10 +3,10 @@ use libfuzzer_sys::{Corpus, fuzz_target};
 use tycho_types::models::{StdAddr, StdAddrFormat};
 
 fuzz_target!(|data: &[u8]| -> Corpus {
-    if let Ok(s) = std::str::from_utf8(data) {
-        if StdAddr::from_str_ext(s, StdAddrFormat::any()).is_ok() {
-            return Corpus::Keep;
-        }
+    if let Ok(s) = std::str::from_utf8(data)
+        && StdAddr::from_str_ext(s, StdAddrFormat::any()).is_ok()
+    {
+        return Corpus::Keep;
     }
     Corpus::Reject
 });

fuzz/fuzz_targets/boc_decode.rs

@@ -3,22 +3,22 @@ use libfuzzer_sys::fuzz_target;
 use tycho_types::prelude::Boc;
 
 fuzz_target!(|data: &[u8]| {
-    if let Ok(cell) = Boc::decode(data) {
-        if let Ok(mut slice) = cell.as_slice() {
+    if let Ok(cell) = Boc::decode(data)
+        && let Ok(mut slice) = cell.as_slice()
+    {
+        _ = slice.get_u8(0);
+        _ = slice.get_u16(0);
+        _ = slice.get_u32(0);
+        _ = slice.get_u64(0);
+        _ = slice.get_u128(0);
+        _ = slice.get_u256(0);
+        if slice.skip_first(3, 0).is_ok() {
             _ = slice.get_u8(0);
             _ = slice.get_u16(0);
             _ = slice.get_u32(0);
             _ = slice.get_u64(0);
             _ = slice.get_u128(0);
             _ = slice.get_u256(0);
-            if slice.skip_first(3, 0).is_ok() {
-                _ = slice.get_u8(0);
-                _ = slice.get_u16(0);
-                _ = slice.get_u32(0);
-                _ = slice.get_u64(0);
-                _ = slice.get_u128(0);
-                _ = slice.get_u256(0);
-            }
         }
     }
 });

fuzz/fuzz_targets/boc_dict.rs

@@ -3,11 +3,11 @@ use libfuzzer_sys::{Corpus, fuzz_target};
 use tycho_types::prelude::{Boc, RawDict};
 
 fuzz_target!(|data: &[u8]| -> Corpus {
-    if let Ok(cell) = Boc::decode(data) {
-        if let Ok(map) = cell.parse::<RawDict<32>>() {
-            _ = map.iter().count();
-            return Corpus::Keep;
-        }
+    if let Ok(cell) = Boc::decode(data)
+        && let Ok(map) = cell.parse::<RawDict<32>>()
+    {
+        _ = map.iter().count();
+        return Corpus::Keep;
     }
     Corpus::Reject
 });

fuzz/fuzz_targets/boc_message.rs

@@ -4,10 +4,10 @@ use tycho_types::models::Message;
 use tycho_types::prelude::Boc;
 
 fuzz_target!(|data: &[u8]| -> Corpus {
-    if let Ok(cell) = Boc::decode(data) {
-        if cell.parse::<Message>().is_ok() {
-            return Corpus::Keep;
-        }
+    if let Ok(cell) = Boc::decode(data)
+        && cell.parse::<Message>().is_ok()
+    {
+        return Corpus::Keep;
     }
     Corpus::Reject
 });

fuzz/fuzz_targets/common.rs

@@ -18,8 +18,7 @@ where
         let ctx = Cell::empty_context();
 
         let initial =
-            dict::build_aug_dict_from_sorted_iter(self.initial_items.into_iter(), A::comp_add, ctx)
-                .unwrap();
+            dict::build_aug_dict_from_sorted_iter(self.initial_items, A::comp_add, ctx).unwrap();
 
         // Build manually
         let mut target = initial.clone();

fuzz/fuzz_targets/dict_modify.rs

@@ -13,7 +13,7 @@ where
 {
     let ctx = Cell::empty_context();
 
-    let initial = dict::build_dict_from_sorted_iter(input.initial_items.into_iter(), ctx).unwrap();
+    let initial = dict::build_dict_from_sorted_iter(input.initial_items, ctx).unwrap();
 
     // Build manually
     let mut target = initial.clone();