Skip to content

Commit

Permalink
Require tokio <1.23.0 to fix incompatibilities on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
uklotzde committed Dec 9, 2022
1 parent e26f717 commit bd36eaf
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

# Changelog

## v0.5.4 (unreleased)

- Fix: Use `tokio` v1.22.x as a temporary workaround to avoid incompatibilities with `mio-serial` on Windows (#136).

## v0.5.3 (2022-06-22)

- Fix (RTU/sync): Execute SerialStream::open within an async runtime [#116](https://github.com/slowtec/tokio-modbus/pull/116)
Expand Down
12 changes: 9 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[package]
name = "tokio-modbus"
description = "Tokio-based Modbus library"
version = "0.5.3"
version = "0.5.4"
authors = ["slowtec GmbH <post@slowtec.de>", "Markus Kohlhase <markus.kohlhase@slowtec.de>"]
license = "MIT OR Apache-2.0"
readme = "README.md"
Expand All @@ -28,15 +28,21 @@ futures-util = { version = "0.3.25", optional = true, default-features = false }
log = "0.4.17"
smallvec = { version = "1.10.0", default-features = false }
socket2 = { version = "0.4.7", optional = true, default-features = false }
tokio = { version = "1.21.2", default-features = false }
# Disable default-features to exclude unused dependency on libudev
tokio-serial = { version = "5.4.4", optional = true, default-features = false }
tokio-util = { version = "0.7.4", features = ["codec"] }

# See also: <https://github.com/slowtec/tokio-modbus/issues/136>
# Workaround cannot be restricted to Windows: <https://github.com/rust-lang/cargo/issues/5896>
tokio = { version = "~1.22.0", default-features = false }

[dev-dependencies]
env_logger = "0.10.0"
futures = "0.3.25"
tokio = { version = "1.21.2", features = ["net", "macros", "io-util", "rt", "time"] }

# See also: <https://github.com/slowtec/tokio-modbus/issues/136>
# Workaround cannot be restricted to Windows: <https://github.com/rust-lang/cargo/issues/5896>
tokio = { version = "~1.22.0", features = ["net", "macros", "io-util", "rt", "time"] }

[features]
default = ["tcp", "rtu"]
Expand Down

0 comments on commit bd36eaf

Please sign in to comment.