Fix changelogs and TooManyArguments

CHANGELOG.md

@@ -9,7 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Allow `ChatJoinRequest` updates
-- Fix `split` parser for tuple variants with len < 2 ([issue #834](https://github.com/teloxide/teloxide/issues/834))
 
 ### Added
 

crates/teloxide-macros/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Fixed
+
+- Fix `split` parser for tuple variants with len < 2 ([issue #834](https://github.com/teloxide/teloxide/issues/834))
+
 ## 0.7.1 - 2023-01-17
 
 ### Fixed

crates/teloxide-macros/src/fields_parse.rs

@@ -138,10 +138,13 @@ fn parser_with_separator<'a>(
 
                 let res = #res;
 
+                if !s.is_empty() && splitted.count() {
+                }
+
                 match splitted.next() {
                     Some(d) if !s.is_empty() => ::std::result::Result::Err(teloxide::utils::command::ParseError::TooManyArguments {
                         expected: #expected,
-                        found: #expected + 1,
+                        found: #expected + 1 + splitted.count(),
                         message: format!("Excess argument: {}", d),
                     }),
                     _ => ::std::result::Result::Ok(res)