Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into dev #782

Merged
merged 9 commits into from
Nov 28, 2022
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,13 @@ jobs:
command: check
args: --examples --features full

# TODO: prolly move it to a separate step?
- name: Check with no default features
uses: actions-rs/cargo@v1
with:
command: check
args: --no-default-features

clippy:
name: Run linter
runs-on: ubuntu-latest
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- `rocksdb-storage` feature and associated items (See [PR #761](https://github.com/teloxide/teloxide/pull/761) for reasoning) [**BC**]

## 0.11.3 - 2022-11-28

### Fixed

- Add another missing feature gate for `dispatching::repls` import ([issue #770](https://github.com/teloxide/teloxide/issues/770))

## 0.11.2 - 2022-11-18

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion MIGRATION_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Note that the list of required changes is not fully exhaustive and it may lack s
If you are using rocksdb storage, you'll need to either write `Storage` impl yourself, or use a third party crate.
<!-- FIXME: add a link once there *is* a third party crate -->

## 0.11 -> 0.11.2
## 0.11 -> 0.11.3

### teloxide

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
> [v0.11 -> v0.11.2 migration guide >>](MIGRATION_GUIDE.md#011---0112)
> [v0.11 -> v0.11.3 migration guide >>](MIGRATION_GUIDE.md#011---0113)

<div align="center">
<img src="./media/teloxide-logo.png" width="250"/>
Expand Down
2 changes: 1 addition & 1 deletion crates/teloxide/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "teloxide"
version = "0.11.1"
version = "0.11.3"
edition = "2021"
description = "An elegant Telegram bots framework for Rust"
repository = "https://github.com/teloxide/teloxide"
Expand Down
3 changes: 3 additions & 0 deletions crates/teloxide/src/dispatching/dispatcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ where
ctrlc_handler,
} = self;

// If the `ctrlc_handler` feature is not enabled, don't emit a warning.
let _ = ctrlc_handler;

let dp = Dispatcher {
bot,
dependencies,
Expand Down
6 changes: 4 additions & 2 deletions crates/teloxide/src/prelude.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ pub use crate::error_handlers::{LoggingErrorHandler, OnError};
pub use crate::respond;

pub use crate::dispatching::{
dialogue::Dialogue, repls::CommandReplExt as _, Dispatcher, HandlerExt as _,
MessageFilterExt as _, UpdateFilterExt as _,
dialogue::Dialogue, Dispatcher, HandlerExt as _, MessageFilterExt as _, UpdateFilterExt as _,
};

#[cfg(feature = "ctrlc_handler")]
pub use crate::dispatching::repls::CommandReplExt as _;

pub use teloxide_core::{
requests::ResponseResult,
types::{
Expand Down