Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
daxpedda committed Sep 6, 2023
1 parent 8145e9c commit fa2d48f
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
3 changes: 2 additions & 1 deletion .config/topic.dic
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
12
13
backported
Changelog
HTTPS
io
MSRV
TLS
TODO
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: false
matrix:
rust:
- { version: 1.60.0, msrv: true }
- { version: 1.63, msrv: true }
- { version: stable, msrv: false }

steps:
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
fail-fast: false
matrix:
rust:
- 1.60.0
- 1.63
- stable

steps:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Changed
- Increased MSRV to v1.63.

## [0.5.2] - 2023-06-16
### Added
- Re-export `bytes`, `http`, `hyper`, `tokio-rustls` and `tokio-util`.
Expand Down Expand Up @@ -54,6 +58,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Initial commit.

[Unreleased]: https://github.com/daxpedda/axum-server-dual-protocol/compare/v0.5.2...main
[0.5.2]: https://github.com/daxpedda/axum-server-dual-protocol/compare/v0.5.1...v0.5.2
[0.5.1]: https://github.com/daxpedda/axum-server-dual-protocol/compare/v0.5.0...v0.5.1
[0.5.0]: https://github.com/daxpedda/axum-server-dual-protocol/compare/v0.4.0...v0.5.0
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ keywords = ["axum-server", "server", "web", "http", "https"]
license = "MIT OR Apache-2.0"
name = "axum-server-dual-protocol"
repository = "https://github.com/daxpedda/axum-server-dual-protocol"
rust-version = "1.60"
rust-version = "1.63"
version = "0.5.2"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ let app = Router::new()

As this library heavily relies on [`axum-server`], [`axum`],
[`tower`] and [`hyper`] the MSRV depends on theirs. At the point of time
this was written the highest MSRV was [`axum`] with 1.60.
this was written the highest MSRV was [`axum`] with 1.63.

## Changelog

Expand Down
7 changes: 2 additions & 5 deletions src/dual_protocol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -349,23 +349,20 @@ where
}
}

// TODO: This was stabilized in 1.61, our MSRV is 1.60 currently because of
// `axum`. See <https://github.com/rust-lang/rust/issues/93706>.
#[allow(clippy::missing_const_for_fn)]
impl<Service, RequestBody, ResponseBody>
DualProtocolServiceFuture<Service, RequestBody, ResponseBody>
where
Service: HyperService<Request<RequestBody>, Response = Response<ResponseBody>>,
{
/// Create a [`DualProtocolServiceFuture`] in the
/// [`Service`](FutureServe::Service) state.
fn new_service(future: Service::Future) -> Self {
const fn new_service(future: Service::Future) -> Self {
Self(FutureServe::Service(future))
}

/// Create a [`DualProtocolServiceFuture`] in the
/// [`Upgrade`](FutureServe::Upgrade) state.
fn new_upgrade(
const fn new_upgrade(
future: <UpgradeHttp<Service> as HyperService<Request<RequestBody>>>::Future,
) -> Self {
Self(FutureServe::Upgrade(future))
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
//!
//! As this library heavily relies on [`axum-server`](axum_server), [`axum`],
//! [`tower`] and [`hyper`] the MSRV depends on theirs. At the point of time
//! this was written the highest MSRV was [`axum`] with 1.60.
//! this was written the highest MSRV was [`axum`] with 1.63.
//!
//! # Changelog
//!
Expand Down
7 changes: 2 additions & 5 deletions src/upgrade_http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,22 +179,19 @@ where
}
}

// TODO: This was stabilized in 1.61, our MSRV is 1.60 currently because of
// `axum`. See <https://github.com/rust-lang/rust/issues/93706>.
#[allow(clippy::missing_const_for_fn)]
impl<Service, Request> UpgradeHttpFuture<Service, Request>
where
Service: HyperService<Request>,
{
/// Create a [`UpgradeHttpFuture`] in the [`Service`](FutureServe::Service)
/// state.
fn new_service(future: Service::Future) -> Self {
const fn new_service(future: Service::Future) -> Self {
Self(FutureServe::Service(future))
}

/// Create a [`UpgradeHttpFuture`] in the [`Upgrade`](FutureServe::Upgrade)
/// state.
fn new_upgrade(response: Response<Body>) -> Self {
const fn new_upgrade(response: Response<Body>) -> Self {
Self(FutureServe::Upgrade(Some(response)))
}
}
Expand Down

0 comments on commit fa2d48f

Please sign in to comment.