Merge branch 'master' into fix-bot-silence

This commit is contained in:
Temirkhan Myrzamadi 2020-07-10 23:55:45 +06:00 committed by GitHub
commit 2b2053ddc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 16 deletions

View file

@ -29,28 +29,28 @@ cbor-serializer = ["serde_cbor"]
bincode-serializer = ["bincode"]
[dependencies]
serde_json = "1.0.44"
serde = { version = "1.0.101", features = ["derive"] }
serde_json = "1.0.56"
serde = { version = "1.0.114", features = ["derive"] }
tokio = { version = "0.2.11", features = ["full"] }
tokio-util = { version = "0.3.0", features = ["full"] }
tokio = { version = "0.2.21", features = ["full"] }
tokio-util = { version = "0.3.1", features = ["full"] }
reqwest = { version = "0.10", features = ["json", "stream"] }
reqwest = { version = "0.10.6", features = ["json", "stream"] }
log = "0.4.8"
lockfree = "0.5.1"
bytes = "0.5.3"
bytes = "0.5.5"
mime = "0.3.16"
derive_more = "0.99.2"
thiserror = "1.0.9"
async-trait = "0.1.22"
futures = "0.3.1"
pin-project = "0.4.6"
serde_with_macros = "1.0.1"
derive_more = "0.99.9"
thiserror = "1.0.20"
async-trait = "0.1.36"
futures = "0.3.5"
pin-project = "0.4.22"
serde_with_macros = "1.1.0"
redis = { version = "0.15.1", optional = true }
redis = { version = "0.16.0", optional = true }
serde_cbor = { version = "0.11.1", optional = true }
bincode = { version = "1.2.1", optional = true }
bincode = { version = "1.3.1", optional = true }
#teloxide-macros = "0.3.1"
teloxide-macros = { git = "http://github.com/teloxide/teloxide-macros", branch = "dev" }

View file

@ -39,9 +39,13 @@ impl Update {
match serde_json::from_str(&value.to_string()) {
Ok(update) => Ok(update),
Err(error) => {
log::error!("Cannot parse an update.\nError: {:?}\nValue: {}\n\
log::error!(
"Cannot parse an update.\nError: {:?}\nValue: {}\n\
This is a bug in teloxide, please open an issue here: \
https://github.com/teloxide/teloxide/issues.", error, value);
https://github.com/teloxide/teloxide/issues.",
error,
value
);
Err(error)
}
}