Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
* dev:
  bump version to 0.14
  bump async-tungstenite from 0.25 to 0.28
  • Loading branch information
najamelan committed Sep 8, 2024
2 parents 25426ef + bb4f91c commit dfe1bec
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 18 deletions.
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,19 @@

## [Unreleased]

[Unreleased]: https://github.com/najamelan/ws_stream_tungstenite/compare/0.13.0...dev
[Unreleased]: https://github.com/najamelan/ws_stream_tungstenite/compare/0.14.0...dev


## [0.14.0] - 2024-09-08

[0.12.0]: https://github.com/najamelan/ws_stream_tungstenite/compare/0.13.0...0.14.0

- **BREAKING_CHANGE**: update async-tungstenite to 0.28
- **BREAKING_CHANGE**: update tungstenite to 0.24

## [0.13.0] - 2024-02-16

[0.12.0]: https://github.com/najamelan/ws_stream_tungstenite/compare/0.12.0...0.13.0
[0.13.0]: https://github.com/najamelan/ws_stream_tungstenite/compare/0.12.0...0.13.0

- **BREAKING_CHANGE**: update async-tungstenite to 0.25

Expand Down
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ rustc_version = "^0.4"
[dependencies]
[dependencies.async-tungstenite]
default-features = false
version = "^0.25"
version = "^0.28"

[dependencies.async_io_stream]
default-features = false
Expand Down Expand Up @@ -53,7 +53,7 @@ version = "^0.1"

[dependencies.tungstenite]
default-features = false
version = "^0.21"
version = "^0.24"

[dev-dependencies]
assert_matches = "^1"
Expand All @@ -72,8 +72,8 @@ features = ["attributes"]
version = "^1"

[dev-dependencies.async-tungstenite]
features = ["tokio-runtime", "async-std-runtime"]
version = "^0.25"
features = ["tokio-runtime", "async-std-runtime", "url"]
version = "^0.28"

[dev-dependencies.tokio]
default-features = false
Expand Down Expand Up @@ -112,7 +112,7 @@ license = "Unlicense"
name = "ws_stream_tungstenite"
readme = "README.md"
repository = "https://github.com/najamelan/ws_stream_tungstenite"
version = "0.13.0"
version = "0.14.0"

[package.metadata]
[package.metadata.docs]
Expand Down
8 changes: 4 additions & 4 deletions Cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ package:
# - `git tag x.x.x` with version number.
# - `git push && git push --tags`
#
version : 0.13.0
version : 0.14.0
name : ws_stream_tungstenite
edition : '2021'
authors : [ Naja Melan <[email protected]> ]
Expand Down Expand Up @@ -69,9 +69,9 @@ dependencies:
futures-sink : { version: ^0.3 , default-features: false }
futures-io : { version: ^0.3 , default-features: false }
futures-util : { version: ^0.3 , default-features: false }
tungstenite : { version: ^0.21, default-features: false }
tungstenite : { version: ^0.24, default-features: false }
pharos : { version: ^0.5 , default-features: false }
async-tungstenite : { version: ^0.25, default-features: false }
async-tungstenite : { version: ^0.28, default-features: false }
tokio : { version: ^1 , default-features: false, optional: true }
tracing : { version: ^0.1 }

Expand All @@ -84,7 +84,7 @@ dependencies:
dev-dependencies:

async-std : { version: ^1, features: [ attributes ] }
async-tungstenite : { version: ^0.25, features: [ tokio-runtime, async-std-runtime ] }
async-tungstenite : { version: ^0.28, features: [ tokio-runtime, async-std-runtime, url ] }
assert_matches : ^1
async_progress : ^0.2
futures : ^0.3
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ With [cargo yaml](https://gitlab.com/storedbox/cargo-yaml):
```yaml
dependencies:

ws_stream_tungstenite: ^0.13
ws_stream_tungstenite: ^0.14
```
With raw Cargo.toml
```toml
[dependencies]

ws_stream_tungstenite = "0.13"
ws_stream_tungstenite = "0.14"
```

### Upgrade
Expand Down
8 changes: 8 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ use rustc_version::{ version_meta, Channel };

fn main()
{
// Needed to avoid warnings for:
// https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html
//
println!("cargo::rustc-check-cfg=cfg(stable)");
println!("cargo::rustc-check-cfg=cfg(beta)");
println!("cargo::rustc-check-cfg=cfg(nightly)");
println!("cargo::rustc-check-cfg=cfg(rustc_dev)");

// Set cfg flags depending on release channel
//
match version_meta().unwrap().channel
Expand Down
8 changes: 4 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#![ cfg_attr( nightly, feature(doc_cfg) ) ]
#![ doc = include_str!("../README.md") ]

#![ doc ( html_root_url = "https://docs.rs/ws_stream_tungstenite" ) ]
#![ deny ( missing_docs ) ]
#![ forbid ( unsafe_code ) ]
#![ allow ( clippy::suspicious_else_formatting ) ]
#![ doc ( html_root_url = "https://docs.rs/ws_stream_tungstenite" ) ]
#![ deny ( missing_docs ) ]
#![ forbid ( unsafe_code ) ]
#![ allow ( clippy::suspicious_else_formatting, clippy::too_long_first_doc_paragraph ) ]

#![ warn
(
Expand Down
2 changes: 1 addition & 1 deletion src/tung_websocket.rs
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ impl<S: Unpin> Stream for TungWebSocket<S> where S: AsyncRead + AsyncWrite + Sen
{
self.state.insert( State::STREAM_CLOSED );

self.queue_event( WsEvent::Error(Arc::new( WsErr::from( std::io::Error::from(e.kind()) ) )) );
self.queue_event( WsEvent::Error(Arc::new( WsErr::from( io::Error::from(e.kind()) ) )) );

Some(Err(e)).into()
}
Expand Down

0 comments on commit dfe1bec

Please sign in to comment.