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.

Sign up for GitHub

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

Jump to bottom

Ship rc.2 #1363

Merged
merged 6 commits into from Sep 11, 2022
Merged

Ship rc.2 #1363

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
890d5d6
rc.2
davidpdrsn Sep 10, 2022
a5e2e27
don't bump version of axum-macros
davidpdrsn Sep 10, 2022
2a8b195
fix
davidpdrsn Sep 10, 2022
b51bbf0
Update axum/Cargo.toml
davidpdrsn Sep 10, 2022
185aca8
undo release of axum-extra
davidpdrsn Sep 10, 2022
5a67828
fix
davidpdrsn Sep 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions axum-core/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

# Unreleased

- None.

# 0.3.0-rc.2 (10. September, 2022)

- **breaking:** Added default limit to how much data `Bytes::from_request` will
consume. Previously it would attempt to consume the entire request body
without checking its length. This meant if a malicious peer sent an large (or
Expand Down
4 changes: 2 additions & 2 deletions axum-core/Cargo.toml
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ license = "MIT"
name = "axum-core"
readme = "README.md"
repository = "https://github.com/tokio-rs/axum"
version = "0.3.0-rc.1" # remember to also bump the version that axum depends on
version = "0.3.0-rc.2" # remember to also bump the version that axum depends on

[dependencies]
async-trait = "0.1"
Expand All @@ -22,7 +22,7 @@ tower-layer = "0.3"
tower-service = "0.3"

[dev-dependencies]
axum = { path = "../axum", version = "0.6.0-rc.1" }
axum = { path = "../axum", version = "0.6.0-rc.2" }
futures-util = "0.3"
hyper = "0.14"
tokio = { version = "1.0", features = ["macros"] }
Expand Down
8 changes: 4 additions & 4 deletions axum-core/src/extract/default_body_limit.rs
View file
Open in desktop
Expand Up @@ -13,8 +13,8 @@ use tower_layer::Layer;
///
/// [`Body::data`]: http_body::Body::data
/// [`Bytes`]: bytes::Bytes
/// [`Json`]: https://docs.rs/axum/0.6.0-rc.1/axum/struct.Json.html
/// [`Form`]: https://docs.rs/axum/0.6.0-rc.1/axum/struct.Form.html
/// [`Json`]: https://docs.rs/axum/0.6.0-rc.2/axum/struct.Json.html
/// [`Form`]: https://docs.rs/axum/0.6.0-rc.2/axum/struct.Form.html
#[derive(Debug, Clone)]
#[non_exhaustive]
pub struct DefaultBodyLimit;
Expand Down Expand Up @@ -50,8 +50,8 @@ impl DefaultBodyLimit {
///
/// [`tower_http::limit`]: https://docs.rs/tower-http/0.3.4/tower_http/limit/index.html
/// [`Bytes`]: bytes::Bytes
/// [`Json`]: https://docs.rs/axum/0.6.0-rc.1/axum/struct.Json.html
/// [`Form`]: https://docs.rs/axum/0.6.0-rc.1/axum/struct.Form.html
/// [`Json`]: https://docs.rs/axum/0.6.0-rc.2/axum/struct.Json.html
/// [`Form`]: https://docs.rs/axum/0.6.0-rc.2/axum/struct.Form.html
pub fn disable() -> Self {
Self
}
Expand Down
4 changes: 2 additions & 2 deletions axum-core/src/extract/mod.rs
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ mod private {
///
/// See [`axum::extract`] for more general docs about extraxtors.
///
/// [`axum::extract`]: https://docs.rs/axum/0.6.0-rc.1/axum/extract/index.html
/// [`axum::extract`]: https://docs.rs/axum/0.6.0-rc.2/axum/extract/index.html
#[async_trait]
pub trait FromRequestParts<S>: Sized {
/// If the extractor fails it'll use this "rejection" type. A rejection is
Expand Down Expand Up @@ -99,7 +99,7 @@ pub trait FromRequestParts<S>: Sized {
/// This ensures your extractor is as flexible as possible.
///
/// [`http::Request<B>`]: http::Request
/// [`axum::extract`]: https://docs.rs/axum/0.6.0-rc.1/axum/extract/index.html
/// [`axum::extract`]: https://docs.rs/axum/0.6.0-rc.2/axum/extract/index.html
#[async_trait]
pub trait FromRequest<S, B, M = private::ViaRequest>: Sized {
/// If the extractor fails it'll use this "rejection" type. A rejection is
Expand Down
4 changes: 4 additions & 0 deletions axum-extra/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning].

- None.

# 0.4.0-rc.2 (10. September, 2022)

- Depend on 0.6.0-rc.2.

# 0.4.0-rc.1 (23. August, 2022)

- **added:** Add `RouterExt::route_with_tsr` for adding routes with an
Expand Down
6 changes: 3 additions & 3 deletions axum-extra/Cargo.toml
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ license = "MIT"
name = "axum-extra"
readme = "README.md"
repository = "https://github.com/tokio-rs/axum"
version = "0.4.0-rc.1"
version = "0.4.0-rc.2"

[features]
default = []
Expand All @@ -34,7 +34,7 @@ spa = ["tower-http/fs"]
typed-routing = ["dep:axum-macros", "dep:serde", "dep:percent-encoding"]

[dependencies]
axum = { path = "../axum", version = "0.6.0-rc.1", default-features = false }
axum = { path = "../axum", version = "0.6.0-rc.2", default-features = false }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should do one of two things here: Either add an exact version dependency so future rc's or the full axum 0.6.0 don't get used as a dependency of axum-extra 0.4.0-rc.2; or not release another rc of axum-extra at all (it doesn't seem to be required, right?).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assumed it was required but if axum-extra-rc.1 can use axum-rc.2 then yeah we don't need a release of axum-extra. I assumed rc versions were considered incompatible.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah they really should be, but aren't. That's why adding the = to the axum-core dependency is important.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright I've reverted the new version of axum-extra.

bytes = "1.1.0"
futures-util = { version = "0.3", default-features = false, features = ["alloc"] }
http = "0.2"
Expand All @@ -58,7 +58,7 @@ tokio-stream = { version = "0.1.9", optional = true }
tokio-util = { version = "0.7", optional = true }

[dev-dependencies]
axum = { path = "../axum", version = "0.6.0-rc.1", features = ["headers"] }
axum = { path = "../axum", version = "0.6.0-rc.2", features = ["headers"] }
futures = "0.3"
hyper = "0.14"
reqwest = { version = "0.11", default-features = false, features = ["json", "stream", "multipart"] }
Expand Down
4 changes: 2 additions & 2 deletions axum-macros/Cargo.toml
View file
Open in desktop
Expand Up @@ -25,8 +25,8 @@ syn = { version = "1.0", features = [
] }

[dev-dependencies]
axum = { path = "../axum", version = "0.6.0-rc.1", features = ["headers"] }
axum-extra = { path = "../axum-extra", version = "0.4.0-rc.1", features = ["typed-routing"] }
axum = { path = "../axum", version = "0.6.0-rc.2", features = ["headers"] }
axum-extra = { path = "../axum-extra", version = "0.4.0-rc.2", features = ["typed-routing"] }
rustversion = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
Expand Down
4 changes: 4 additions & 0 deletions axum/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

# Unreleased

- None.

# 0.6.0-rc.2 (10. September, 2022)

## Security

- **breaking:** Added default limit to how much data `Bytes::from_request` will
Expand Down
4 changes: 2 additions & 2 deletions axum/Cargo.toml
View file
Open in desktop
@@ -1,6 +1,6 @@
[package]
name = "axum"
version = "0.6.0-rc.1"
version = "0.6.0-rc.2"
categories = ["asynchronous", "network-programming", "web-programming::http-server"]
description = "Web framework that focuses on ergonomics and modularity"
edition = "2021"
Expand Down Expand Up @@ -30,7 +30,7 @@ __private_docs = ["tower/full", "tower-http/full"]

[dependencies]
async-trait = "0.1.43"
axum-core = { path = "../axum-core", version = "0.3.0-rc.1" }
axum-core = { path = "../axum-core", version = "0.3.0-rc.2" }
davidpdrsn marked this conversation as resolved.
Show resolved Hide resolved
bitflags = "1.0"
bytes = "1.0"
futures-util = { version = "0.3", default-features = false, features = ["alloc"] }
Expand Down